Merge "Imported Translations from Transifex"

21 files changed, 18470 insertions, 17439 deletions

diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index bafd04498..ce74e2b3c 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -184,158 +184,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,132 +347,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr ""
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -476,734 +480,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1345,138 +1349,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1888,14 +1880,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1923,7 +1915,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2186,222 +2178,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2409,19 +2396,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2912,7 +2899,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2965,184 +2952,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3151,487 +3138,495 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3858,54 +3853,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4200,7 +4191,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4208,39 +4223,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4248,89 +4263,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4408,26 +4423,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5052,19 +5060,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5147,12 +5155,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5169,17 +5177,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5203,59 +5211,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5368,7 +5376,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5395,16 +5403,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5600,7 +5608,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5615,7 +5623,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6153,7 +6161,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6178,7 +6186,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
@@ -6213,7 +6221,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6331,219 +6339,219 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6553,51 +6561,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6638,127 +6646,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6787,31 +6795,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6831,19 +6839,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7413,150 +7421,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7658,423 +7682,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8083,181 +8095,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8289,7 +8301,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8302,7 +8314,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8364,12 +8376,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8418,47 +8435,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9019,52 +9036,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9833,3 +9850,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index cf6c00cfe..1584902f7 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -168,7 +168,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Svazek %(volume_id)s není k ničemu připojen"
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr "Data páru klíčů jsou neplatná"
 
@@ -192,41 +192,46 @@ msgstr "Neplatný typ svazku"
 msgid "Invalid volume"
 msgstr "Neplatný svazek"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "Neplatná metadata"
 
 #: nova/exception.py:267
+#, fuzzy
+msgid "Invalid metadata size"
+msgstr "Neplatný klíč metadata"
+
+#: nova/exception.py:271
 #, 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:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Neplatný protokol IP %(protocol)s."
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Neplatný typ obsahu %(content_type)s."
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Neplatný cidr %(cidr)s."
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -235,16 +240,16 @@ msgstr ""
 "Nelze provést činnost '%(action)s' na agregátu %(aggregate_id)s. Důvod: "
 "%(reason)s."
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -253,97 +258,97 @@ msgstr ""
 "Instance %(instance_uuid)s v %(attr)s %(state)s.  Nelze %(method)s "
 "zatímco je instance v tomto stavu."
 
-#: nova/exception.py:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s není spuštěna."
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, 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:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s není pozastavena."
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr "Server nemůže pokračovat"
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr "Služba je v tuto chvíli nedostupná."
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr "Služba výpočtu je v tuto chvíli nedostupná."
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, 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:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Zadaný typ hypervizoru je neplatný."
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 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:366
+#: nova/exception.py:370
 #, 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:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, 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:379
+#: nova/exception.py:383
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr "Nepřijatelné informace o procesoru"
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, 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:391
+#: nova/exception.py:395
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -352,7 +357,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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -363,76 +368,76 @@ msgstr ""
 " fyzickým adaptérem. Očekávaný vSwitch je %(expected)s, ale spojený je "
 "%(actual)s."
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formát disku %(disk_format)s není přijatelný"
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Obraz %(image_id)s je nepřijatelný: %(reason)s"
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Instance %(instance_id)s je nepřijatelná: %(reason)s"
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Id Ec2 %(ec2_id)s je nepřijatelné."
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance - %s není přítomno"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr "Zdroj nemohl být nalezen."
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, fuzzy, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "Nelze nalézt účet %(account_name) on zařízení Solidfire"
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "Svazek %(volume_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Typ svazku %(volume_type_id)s nemohl být nalezen."
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Typ svazku s názvem %(volume_type_name)s nemohl být nalezen."
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -441,57 +446,57 @@ msgstr ""
 "Typ svazku %(volume_type_id)s nemá žádné dodatečné parametry s klíčem "
 "%(extra_specs_key)s."
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "mazání svazku %(volume_name)s který má snímek"
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, 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:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, fuzzy, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Źádný disk ve %(location)s"
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, 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:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Neplatný href %(image_href)s obrazu."
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -499,55 +504,55 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "Nelze najít SR pro čtení/zápis VDI."
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, 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:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, 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:542
+#: nova/exception.py:546
 #, 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:546
+#: nova/exception.py:550
 #, 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:550
+#: nova/exception.py:554
 #, 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:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Źádné sítě nejsou určeny."
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -556,238 +561,238 @@ msgstr ""
 "Buď síť uuid %(network_uuid)s není přítomna nebo je přidělena projektu "
 "%(project_id)s."
 
-#: nova/exception.py:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "Hostitel není v síti (%(network_id)s) nastaven."
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 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:571
+#: nova/exception.py:575
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, fuzzy, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "Žádná pevná IP není spojena s %(id)s."
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Pevná ip není pro adresu %(address)s nalezena."
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, 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:591
+#: nova/exception.py:595
 #, 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:596
+#: nova/exception.py:600
 #, 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:600
+#: nova/exception.py:604
 #, 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:605
+#: nova/exception.py:609
 #, 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:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Pevná IP adresa (%(address)s) je neplatná."
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr "Je dostupno nula pevných ip."
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr "Bylo nalezeno nula pevných ip."
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Plovoucí ip není nalezena pro id %(id)s."
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, 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:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Plovoucí ip nenalezeno pro adresu %(address)s."
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Plovoucí ip nenalezeno pro hostitele %(host)s."
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "Plovoucí ip nenalezeno pro adresu %(address)s."
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr "Existuje nula plovoucích ip."
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Rozhraní %(interface)s nenalezeno."
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, 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:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Certifikát %(certificate_id)s nenalezen."
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Hostitel %(host)s nemohl být nalezen."
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, 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:706
+#: nova/exception.py:710
 #, 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:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr "Kvóta nemohla být nalezena."
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, 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:731
+#: nova/exception.py:735
 #, 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:735
+#: nova/exception.py:739
 #, 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:739
+#: nova/exception.py:743
 #, 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:743
+#: nova/exception.py:747
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Rozšířený zdroj: %s"
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Bezpečnostní skupina %(security_group_id)s není nalezena."
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, 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:756
+#: nova/exception.py:760
 #, 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:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -796,7 +801,7 @@ msgstr ""
 "Bezpečnostní skupina %(security_group_id)s je již přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -805,22 +810,22 @@ msgstr ""
 "Bezpečnostní skupina %(security_group_id)s není přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Přesun %(migration_id)s nemohl být nalezen."
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, 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:779
+#: nova/exception.py:783
 #, 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:783
+#: nova/exception.py:787
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -829,17 +834,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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Konzole %(console_id)s nemohla být nalezena."
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, 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:797
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
@@ -848,59 +853,59 @@ msgstr ""
 "Konzole pro instanci %(instance_id)s v zásobě %(pool_id)s nemohla být "
 "nalezena."
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Neplatná konzole typu %(console_type)s "
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, 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:810
+#: nova/exception.py:814
 #, 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:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Konfigurace %(flavor_id)s nemohla být nalezena."
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, 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:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr "Funkce nákladů plánovače %(cost_fn_str)s nemohla být nalezena."
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr "Příznak váhy plánovače nemohl být nalezen: %(flag_name)s"
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, 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:842
+#: nova/exception.py:846
 #, 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:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -909,346 +914,346 @@ msgstr ""
 "Instance typu %(instance_type_id)s nemá žádné dodatečné specifikace s "
 "klíčem %(extra_specs_key)s."
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Soubor %(file_path)s nemohl být nalezen."
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr "Nalezeno nula souborů."
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, 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:865
+#: nova/exception.py:869
 #, 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:869
+#: nova/exception.py:873
 #, 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:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr "Činnost není povolena."
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr "Střídání není povoleno pro snímky"
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr "Parametr rotation je vyžadován pro backup image_type"
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "Dvojice klíčů %(key_name)s již existuje."
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s již existuje."
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "Typ svazku %(name)s již existuje."
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, 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:914
+#: nova/exception.py:918
 #, 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:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr "Chyba přesunu"
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, 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:936
+#: nova/exception.py:940
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "Při změně velikosti ji musí instance změnit také!"
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr "Obraz je větší než typ instance povoluje"
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 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:948
+#: nova/exception.py:952
 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:952
+#: nova/exception.py:956
 #, 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:956
+#: nova/exception.py:960
 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:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Hostitel %(host)s není dostupný nebo neexistuje."
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr "Kvóta překročena"
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, fuzzy, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr "Překročen limit osobnostního souboru"
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr "Cesta osobnostního souboru je příliš dlouhá"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr "Obsah osobnostního souboru je příliš dlouhý"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Vybrán maximální počet hostitelů (%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, 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:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Agregát %(aggregate_id)s nemohl být nalezen."
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Agregát %(aggregate_name)s již existuje."
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, 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:1033
+#: nova/exception.py:1037
 #, 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:1038
+#: nova/exception.py:1042
 #, 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:1042
+#: nova/exception.py:1046
 #, fuzzy, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "Zjištěn více než jeden svazek s názvem %(vol_name)"
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 "Nelze vytvořit typ_svazku s názvem %(name)s a specifikacemi "
 "%(extra_specs)s"
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Vyskytla se neočekávaná výjimka."
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, 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:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr "Špatná odpověď od SolidFire API"
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "Chyba v odpovědi SolidFire API: data=%(data)s"
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Zjišťěna existující vlan s id %(vlan)"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, 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:1114
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s nenalezena"
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, 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:1147
+#: nova/exception.py:1151
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projekt %(project_id)s nemohl být nalezen."
@@ -1392,138 +1397,126 @@ msgstr "modelový server je nedostupný"
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Získány neznámé argumenty klíčového slova pro utils.execute: %r"
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Spouštění příkazu (podproces): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Výsledek byl %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r selhalo. Opakování."
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Spouštění příkazu (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr "Prostředí není podporováno přes SSH"
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr "process_input není podporován přes SSH"
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "ladění ve zpětném volání: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Adresa místního spojení nenalezena.: %s"
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, 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:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Neplatná podpůrná vrstva: %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "podpůrná vrstva: %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr "v opakujícím volání"
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Získán semafor \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Pokus o získání zámku souboru \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Získán zámek souboru \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Očekáván objekt typu: %s"
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Nelze odstranit kontejner: %s"
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, 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:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr "Zastavování serveru WSGI."
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr "Server WSGI byl zastaven."
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr "Musíte zavést __call__"
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, fuzzy, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr "Nelze načíst aplikaci vložení '%(name)s' z %(path)s"
@@ -1950,14 +1943,14 @@ msgstr "Musí být určena třída ExtensionManager"
 msgid "Extended resource: %s"
 msgstr "Rozšířený zdroj: %s"
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr "Rozšíření %(ext_name)s: nelze rozšířit %(collection)s: Žádný takový zdroj"
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Rozšíření %(ext_name)s: rozšiřování zdroje %(collection)s"
@@ -1985,7 +1978,7 @@ msgstr "parametr offset musí být celé číslo"
 msgid "offset param must be positive"
 msgstr "parametr offset musí být kladný"
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr "značka [%s] nenalezena"
@@ -2254,230 +2247,225 @@ msgstr "Tento požadavek má omezen množství."
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr "Server neexistuje"
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr "Položka metadat nenalezena"
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr "Instance nemohla být nalezena"
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr "Neplatný stav serveru: %(status)s"
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr "Neplatná hodnota changes-since"
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr "Název serveru není řetězec nebo unicode"
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr "Název serveru je prázdný řetězec"
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 #, fuzzy
 msgid "Server name must be less than 256 characters."
 msgstr "Dvojice klíčů musí být dlouhá 1 až 255 znaků."
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "Špatný formát osobnosti: chybí %s"
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr "Špatný formát osobnosti"
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "Obsah osobnosti pro %s nemůže být dekódován"
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 #, fuzzy
 msgid "Unknown argment : port"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, fuzzy, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr "Špatný formát sítí: uuid sítě není ve správném formátu (%s)"
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "Špatný formát sítí: uuid sítě není ve správném formátu (%s)"
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "Neplatná pevná IP adresa (%s)"
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Duplicitní sítě (%s) nejosu povoleny"
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Špatný formát sítě: chybí %s"
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr "Špatný formát sítě"
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr "Obsah uživatelských dat nemůže být dekódován"
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 není ve správném formátu IPv4"
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 #, fuzzy
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr "accessIPv4 není ve správném formátu IPv4"
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr "Název serveru není určen"
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr "Zadáno neplatné flavorRef."
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 #, fuzzy
 msgid "min_count must be an integer value"
 msgstr "parametr limit musí být celé číslo"
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 #, fuzzy
 msgid "max_count must be an integer value"
 msgstr "parametr limit musí být celé číslo"
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr "Nelze najít požadovaný obraz"
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr "Zadán neplatný název_klíče."
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "id nemůže být None"
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr "Instanci nebyla změněna velikost."
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr "Chyba v confirm-resize %s"
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr "Chyba v revert-resize %s"
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 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:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr "Chybí argument 'type' pro restart"
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr "Chyba v restartu %s"
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr "Nelze najít požadovanou konfiguraci."
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Resize vyžaduje změnu velikosti."
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr "Chybí vlastnost imageRef"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr "Zadáno neplatné imageRef."
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr "Chybí vlastnost flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr "Nebylo zadáno adminPass"
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr "Neplatné adminPass"
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Nelze zpracovat metadata dvojic hodnot/klíčů."
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti má neplatnou vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2485,19 +2473,19 @@ msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 msgid "Invalid request body"
 msgstr "Neplatné tělo požadavku"
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr "Nelze zpracovat imageRef z požadavku."
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr "Nelze najít obraz ke znovu sestavení"
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr "Objekt createImage cyžaduje vlastnost name"
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
@@ -3005,7 +2993,7 @@ msgstr "Síť kterou odeslat do nastavení openvpn"
 msgid "Netmask to push into openvpn config"
 msgstr "Síťovou masku kterou odeslat do nastavení openvpn"
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Spouštění VPN pro %s"
@@ -3065,72 +3053,72 @@ msgstr "Bezpečnostní skupina %s by neměla být větší než 255 znaků."
 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:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Chystá se spuštění %s instancí..."
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 #, fuzzy
 msgid "No host for instance, deleting immediately"
 msgstr "Žádný hostitel pro instnaci %s, okamžitě smazána"
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 #, fuzzy
 msgid "host for instance is down, deleting from database"
 msgstr "Žádný hostitel pro instnaci %s, okamžitě smazána"
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "Hledání podle: %s"
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "Nerozpoznaný typ obrazu %s"
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id je None. Předpokládán přesun."
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -3139,47 +3127,47 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 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:2268
+#: nova/compute/api.py:2272
 #, 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:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Bezpečnostní skupina %s nemůže být prázdná."
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -3188,73 +3176,73 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
 "255 znaků."
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, 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:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Vytvořit bezpečnostní skupinu %s"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Bezpečnostní skupina %s již existuje"
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Pravidlo (%s) nenalezeno"
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Povolit přístup bezpečnostní skupiny %s"
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Zrušit přístup bezpečnostní skupiny %s"
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr "argumenty create musí být kladná celá čísla"
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Instance typu %s není nalezena ke smazání"
@@ -3263,78 +3251,87 @@ msgstr "Instance typu %s není nalezena ke smazání"
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "Zaznamování ovladače svazku: %s"
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Nelze načíst ovladač virtualizace: %s"
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, 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:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Restartování instance po restartu nova-compute."
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Ovladač hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Ovladač hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr "Kontrola stavu"
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Nastavování bdm %s"
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "Navrácení sítě pro instnac"
+
+#: nova/compute/manager.py:549
 #, fuzzy, python-format
 msgid "Build error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "Instance již byla vytvořena"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3343,7 +3340,7 @@ msgstr ""
 "ID obrázku=%(image_id)s, velkost obrázku v bajtech=%(size_bytes)d, "
 "povoleno bajtů=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3352,73 +3349,73 @@ msgstr ""
 "Velikost %(size_bytes)d obrázku '%(image_id)s' překročila povolenou "
 "velkost %(allowed_size_bytes)d pro typ instance"
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr "Spouštění instance..."
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr "Instance selhala v nastavení sítě"
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr "Instance selhala nastavení blokového zařízení"
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s nstance"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr "ukončování bdm %s"
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Nastavování stavu vm instance na ERROR"
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Znovu sestavování instance %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Restartování instance %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3427,17 +3424,17 @@ 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:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Nelze znovu sestavit instanci [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3446,46 +3443,46 @@ 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:1246
+#: nova/compute/manager.py:1269
 #, 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:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Střídání %d záloh"
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr "Mazání obrazu %s"
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, 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:1295
+#: nova/compute/manager.py:1318
 #, fuzzy
 msgid "Root password set"
 msgstr "Instance %s: Nastavení hesla root"
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr "set_admin_password není tímto ovladačem zavedeno"
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password není tímto ovladačem zavedeno"
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Chyba při nastavování hesla správce"
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, fuzzy, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
@@ -3494,136 +3491,136 @@ msgstr ""
 "pokus o vsunutí souboru do nespuštěné instance: %(instance_uuid)s (stav: "
 "%(current_power_state)s očekáváno: %(expected_state)s)"
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: rušení záchrany"
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr "cíl stejný jako zdroj!"
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 #, fuzzy
 msgid "Pausing"
 msgstr "Aktualizování!"
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: získávání diagnostik"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "Reset sítě"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 #, fuzzy
 msgid "Inject network info"
 msgstr "instance %s: vkládání informací o síti"
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info vkládá: |%s|"
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, 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:2020
+#: nova/compute/manager.py:2063
 #, 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:2029
+#: nova/compute/manager.py:2072
 #, 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:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, 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:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Odpojování svazku z neznámé instance %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr "Instance nemá svazek."
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "Přesun před spuštěním selhal na %(dest)s"
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "zahájen přesun po spuštění."
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr "Nenalezeny žádné plovoucí ip."
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3632,12 +3629,12 @@ msgstr ""
 "Přesun za provozu: Neočekávaná chyba: nelze zdědit plovoucí ip.\n"
 "%(e)s"
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "Přesun instance do %(dest)s úspěšně dokončen."
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3645,16 +3642,16 @@ 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:2343
+#: nova/compute/manager.py:2397
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Spuštěna operace po migraci"
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -3663,59 +3660,59 @@ msgstr ""
 "Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
 "%(confirm_window)d vteřin"
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, 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:2521
+#: nova/compute/manager.py:2575
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Instance %(instance_id)s nenalezena"
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr "Aktualizace stavu hostitele"
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3724,48 +3721,48 @@ msgstr ""
 "Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
 "hypervizoru."
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance není zapnuta"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr "Znovu získávání smazané instance"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, fuzzy, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -3774,7 +3771,7 @@ msgstr ""
 "Zjištěna instance se jmenovkou '%(name_label)s', která je označena jako "
 "SMAZÁNA, ale stále je přítomna na hostiteli."
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, fuzzy, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -3783,7 +3780,7 @@ msgstr ""
 "Ničení instance se jmenovkou '%(name_label)s', která je označena jako "
 "SMAZÁNA, ale stále je přítomna na hostiteli."
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -4012,56 +4009,52 @@ msgstr "Obdržena známka: %(token)s, %(token_dict)s)"
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "Kontrola známky: %(token)s, %(token_valid)s)"
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr "Použití prázdného kontextu požadavku je zastaralé"
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Nerozpoznaná hodnota read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "podpůrná vrstva: %s"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "Žádné nastavení podpůrné vrstvy s id %(sm_backend_id)s"
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, fuzzy, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr "Žádné nastavení podpůrné vrstvy s id %(sm_backend_id)s"
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 #, fuzzy
 msgid "Flavor exists"
 msgstr "konfigurace: %s"
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, fuzzy, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr "Konfigurace %(flavor_id)s nemohla být nalezena."
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, fuzzy, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr "Žádná konfigurace sm s názvem %(sm_flavor)s"
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, fuzzy, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr "Žádná konfigurace sm s názvem %(sm_flavor)s"
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "Žádný svazek sm s id %(volume_id)s"
@@ -4368,7 +4361,31 @@ msgstr "Pro %s překročena kvóta, pokus o přidělení adresy"
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "Svazek není nalezen v instanci %(instance_id)s."
+
+#: nova/network/manager.py:656
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr "Pevná IP adresa (%(address)s) je již používána."
+
+#: nova/network/manager.py:677
+#, fuzzy, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr "Vypínání VM pro instanci %(instance_uuid)s"
+
+#: nova/network/manager.py:685
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr "Pevná IP adresa (%(address)s) je již používána."
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4378,41 +4395,41 @@ msgstr ""
 "Nesoulad databáze: Doména DNS |%s| je registrována v Nova db, ale není "
 "viditelná plovoucímu ovladači DNS ani instančnímu. Bude ignorována."
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "Doména |%(domain)s| již existuje, změna zóny na |%(av_zone)s|."
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Doména |%(domain)s| již existuje, změna projektu na |%(project)s|."
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "%s odloučených zastaralých ip"
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr "nastavování hostitele sítě"
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 #, fuzzy
 msgid "network allocations"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr "sítě získané pro instanci |%(instance_id)s|: |%(networks)s|"
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "oddělení sítě pro instanci |%s|"
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4423,69 +4440,69 @@ msgstr ""
 " Instance |%(instance)s| je v zóně |%(zone2)s|. Nebude vytvořen žádný "
 "záznam DNS."
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Vypůjčená IP |%(address)s|"
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "Vypůjčená IP %s není přidělena"
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "Vypůjčena IP |%s|, která není přidělena"
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Uvolněna IP |%(address)s|"
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "Uvolněna IP %s, která není přidělena"
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "Uvolněna IP %s, která nebyla vypůjčena"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, fuzzy, python-format
 msgid "%s must be an integer"
 msgstr "parametr offset musí být celé číslo"
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr "cidr je již používáno"
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existující supersítí "
 "(%(super)s)"
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -4494,22 +4511,22 @@ msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existujícím menším cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr "Síť již existuje!"
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Síť musí být odloučena od projektu %s před smazáním"
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "Suma mezi počtem sítí a spuštění vlan nemůže být větší než 4094"
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4589,28 +4606,21 @@ msgstr "Plovoucí ip není nalezena pro id %(id)s."
 msgid "syslog facility must be one of: %s"
 msgstr "zařízení záznamu systému musí být jedno z: %s"
 
-#: nova/openstack/common/policy.py:149
-#, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
-msgstr ""
-
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:394
 #, fuzzy, python-format
-msgid "Failed to understand rule %(match)r"
+msgid "Failed to understand rule %(rule)s"
 msgstr "Nelze vložit soubor: %(resp)r"
 
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
-msgstr ""
-
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:404
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
+#: nova/openstack/common/policy.py:679
+#, fuzzy, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr "Nelze vložit soubor: %(resp)r"
+
 #: nova/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -5247,19 +5257,19 @@ msgstr "již připojeno"
 msgid "already detached"
 msgstr "již odpojeno"
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr "Prosím rozšiřte nepravý modul libvirt aby podporoval příznaky"
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5344,12 +5354,12 @@ msgstr "Zadaná data: %s"
 msgid "Result data: %s"
 msgstr "Výsledná data: %s"
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Vytváření souborů v %s pro simulaci agenta hosta"
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
@@ -5366,18 +5376,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "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:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5401,59 +5411,59 @@ msgstr "_získat: %s"
 msgid "_get_all: %s"
 msgstr "_získat_vše: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr "_zkouška_vytvoření_snímku: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr "test_snímek_vytvoření: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr "test_snímek_vynucení_vytvoření: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr "test_snímek_vynucení_vytvoření: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr "zobrazení_test_snímku: resp=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr "test_snímek_podrobnosti: resp_dict=%s"
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr "Spouštění instancí: %s"
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Po ukončení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Po vynuceném ukončení instancí: %s"
@@ -5569,7 +5579,7 @@ msgstr "Neočekávaný kód stavu"
 msgid "Decoding JSON: %s"
 msgstr "Dekódování JSON: %s"
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5597,16 +5607,16 @@ 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:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr "zpracování 'qemu-img info' selhalo."
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, 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:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Převedeno na prosté, ale formát je nyní %s"
@@ -5805,7 +5815,7 @@ msgid "instance %s: finished toXML method"
 msgstr "instance %s: dokončena metoda toXML"
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5822,7 +5832,7 @@ msgstr "#### RLK: cpu_arch = %s "
 msgid "Updating!"
 msgstr "Aktualizování!"
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Aktualizace statistik hostitele"
@@ -6378,7 +6388,7 @@ msgstr "Vytváření SR %s"
 msgid "Removing existing folder %s "
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "block_device_list %s"
@@ -6403,7 +6413,7 @@ msgstr "Připojeni svazku: %(connection_info)s, %(instance_name)s, %(mountpoint)
 msgid "Attach volume failed: %s"
 msgstr "Odpojit svazek %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Nelze připojit svazek k instanci %s"
@@ -6438,7 +6448,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Nelze odstranit kontejner: %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr "Nelze zjistit název zavaděče iscsi"
 
@@ -6556,192 +6566,192 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr "Připojení k libvirt poškozeno"
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, 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:482
+#: nova/virt/libvirt/driver.py:480
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr "Instance úspěšně zničena."
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, 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:537
+#: nova/virt/libvirt/driver.py:535
 #, 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:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "Mazání souborů instance %(target)s"
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, 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:718
+#: nova/virt/libvirt/driver.py:728
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr "připojování bloku zařízení LXC"
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr "odpojování bloku zařízení LXC"
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr "Instance je spuštěna"
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:1267
+#: nova/virt/libvirt/driver.py:1275
 msgid "Creating image"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1411
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr "Vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring 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:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr "Spuštění metody toXML"
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr "Metoda toXML dokočena"
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -6750,20 +6760,20 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "verze libvirt je příliš stará (nepodporuje getVersion)"
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 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:2292
+#: nova/virt/libvirt/driver.py:2299
 #, 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:2330
+#: nova/virt/libvirt/driver.py:2337
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -6772,7 +6782,7 @@ msgstr ""
 "Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek disku  "
 "(hostitel:%(available)s <= instance:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -6781,7 +6791,7 @@ msgstr ""
 "Spuštěná instance má info o CPU:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6796,7 +6806,7 @@ msgstr ""
 "\n"
 "Prohlédněte si %(u)s"
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -6805,49 +6815,49 @@ 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, 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:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 "plug_vifs() selhalo %(cnt)d.opakování až na %(max_retry)d pro "
 "%(hostname)s."
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "přeskakování %(path)s protože vypadá jako svazek"
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Instance %s: Spouštění přesunu disku a vypnutí"
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Instance %s úspěšně běží."
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "Instance %s: Spouštění dokončení přesunu"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "Instance %s: Spuštění dokočení vrácení přesunu"
@@ -6891,22 +6901,22 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr "neznámá obslužná rutina obrazu disku: %s"
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s je platný název instance"
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s má soubor disku"
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "Instance %(instance)s je zálohována %(backing)s"
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
@@ -6915,44 +6925,44 @@ msgstr ""
 "Instance %(instance)s používá soubor zálohy %(backing)s, který se "
 "neobjevuje ve službě obrazu"
 
-#: nova/virt/libvirt/imagecache.py:236
+#: nova/virt/libvirt/imagecache.py:234
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr "%(container_format)s-%(id)s (%(base_file)s):ověření obrazu selhalo"
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s): ověření obrazu přeskočeno, "
 "žádný hash neuložen"
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, fuzzy, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr "Nelze odstranit %(base_file)s, chyba byla %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "Základní souboru je příliš nový k odstranění: %s"
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "Nelze odstranit %(base_file)s, chyba byla %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr "%(container_format)s-%(id)s (%(base_file)s): kontrolování"
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, fuzzy, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
@@ -6961,7 +6971,7 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s): je používáno: v tomto uzlu "
 "%(local)d local, %(remote)d v ostatních uzlech"
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, fuzzy, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
@@ -6970,58 +6980,58 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s): varování -- je používán "
 "chybějící základní soubor! instance: %(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s): v: ostatní uzly (%(remote)d "
 "v ostatních uzlech)"
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s): obraz není používán"
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s): obraz je používán"
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "Přeskakování oěření, žádný základní adresář v %s"
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr "Ověřit základní obrazy"
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "Neznámý základní soubor: %s"
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr "Aktivní základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "Poškozené základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr "Odstranitelné základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr "Ověření dokončeno"
 
@@ -7050,31 +7060,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "_vytvořit: %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "Přepsáno %s"
@@ -7095,12 +7105,12 @@ msgstr "Zajišťování mostu %s"
 msgid "Failed while unplugging vif"
 msgstr "Nelze při odpojení vif instance '%s'"
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI zařízení v %s nenalezeno"
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -7109,7 +7119,7 @@ msgstr ""
 "ISCSI svazek zatím v %(mount_device)s nenalezen:. Bude znovu provedeno "
 "hledání a další pokus. Číslo pokusu: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr "Nalezen uzel iSCSI %(mount_device)s (po %(tries)s pokusech)"
@@ -7731,14 +7741,14 @@ msgstr "Získávání velikosto brazu %s"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Získáná velikost %(size)s obrazu %(image)s"
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, 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:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -7747,12 +7757,12 @@ msgstr ""
 "NEZAVEDENO: Volání %(method)s není agentem podporováno. VM "
 "id=%(instance_uuid)s; arg=%(args)r"
 
-#: nova/virt/xenapi/agent.py:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, 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:92
+#: nova/virt/xenapi/agent.py:99
 #, fuzzy, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
@@ -7761,68 +7771,88 @@ msgstr ""
 "Volání %(method)s agentem vrátilo neplatnou odpověď: %(ret)r. VM "
 "id=%(instance_uuid)s; cesta=%(path)s; arg=%(addl_args)r"
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr "Nelze se dotázat na verzi agenta: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr "Dotaz na verzi agenta"
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Aktualizace agenta na %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr "Nelze aktualizovat agenta: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr "Nastavování správcovského hesla"
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr "Nelze vyměnit klíče: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr "Nelze aktualizovat heslo: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr "Nelze vložit soubor: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr "Reset sítě"
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, fuzzy, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "Nelze vložit soubor: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+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:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+"Nástroje XenServer jsou v tomto obrazu přítomny, ale nejsou schopny "
+"vložit síť"
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr "Nástroje XenServer nejsou v tomto obrazu nainstalovány"
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Chyba OpenSSL: %s"
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 #, fuzzy
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
@@ -7832,58 +7862,58 @@ msgstr ""
 "Pro použití connection_type=xenapi musíte zadat xenapi_connection_url, "
 "xenapi_connection_username (nepovinné), a xenapi_connection_password"
 
-#: nova/virt/xenapi/driver.py:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Nelze dešifrovat soukromý klíč: %s"
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr "Spuštění hostitele na XenServer není podporováno."
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 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:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obdržena výjimka: %s"
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "Oznamování NotImplemented"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake nemá zavedeno %s"
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Volání %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7988,70 +8018,70 @@ msgstr ""
 "PIF %(pif_rec['uuid'])s pro síť %(bridge)s má id VLAN %(pif_vlan)d. "
 "Očekáváno %(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 #, fuzzy
 msgid "Created VM"
 msgstr "_vytvořit: %s"
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, fuzzy
 msgid "VM already halted, skipping shutdown..."
 msgstr "VM %(instance_uuid)s již je zastavena, přeskakování vypnutí..."
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD v instanci %s nenalezeno"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "již odpojeno"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Nelze odpojit VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Nelze zničit VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Vytvořeno VBD %(vbd_ref)s pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Vytvořeno VBD %(vbd_ref)s pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Nelze zničit VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -8060,32 +8090,37 @@ msgstr ""
 "Vytvořeno VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) na %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+#, fuzzy
+msgid "SR not present and could not be introduced"
+msgstr "Instance nemohla být nalezena"
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "Zkopírováno VDI %(vdi_ref)s z VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Nenalezeno žádné hlavní VDI pro %(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Žádání xapi o nahrání %(vdi_uuids)s jako ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
@@ -8094,49 +8129,49 @@ msgstr ""
 "Rychlé kopírování je podporováno pouze na výchozím místním SR typu ext. "
 "SR na tomto systému je typu %(sr_type)s. Ignorování příznaku cow."
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' vrátil VDI typu '%(vdi_type)s' s UUID '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Žádání xapi o získání obrazu vhd %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, 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:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
@@ -8145,17 +8180,17 @@ msgstr ""
 "Velkost %(size_bytes) obrazu překračuje povolenou velikost "
 "%(allowed_size_bytes)d typu instance"
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, 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:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -8164,57 +8199,57 @@ msgstr ""
 "Obraz Kernel/Ramdisk je příliš velký: %(vdi_size)d bajtů, max "
 "%(max_size)d bajtů"
 
-#: nova/virt/xenapi/vm_utils.py:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, 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:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s zničeno"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "instance %s: nelze získat obraz glance"
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, 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:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Hledání vdi %s pro kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "Neznámý formát obrazu %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s je stále dostupné"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Znovu skenování SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, 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:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
@@ -8223,50 +8258,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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr "Nelze najít SR typu obsahu ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO: hledání SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr "ISO: není obsah iso"
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO: typ obsahu iso, není klíč 'i18n-key'"
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 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:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR odpovídající naším kritériím"
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 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:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s zmizelo"
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, 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:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR s místním PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -8275,22 +8310,22 @@ msgstr ""
 "Nelze získat RRD XML pro VM %(vm_uuid)s mající podrobnosti serveru: "
 "%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "Nelze získat aktualizace RRD XML s podrobnostmi serveru: %(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "Neznámá data statistik od Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -8299,75 +8334,75 @@ 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "Překročeny pokusy o splynutí VHD (%(max_attempts)d), přerušeno..."
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, 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:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Zapojování VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Zapojování VBD %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, 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:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, 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:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ničení VBD pro VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ničení VBD pro VDI %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Spouštění pygrub s %s"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Nalezen kernel Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Žádný kernel Xen nenalezen. Zavádění HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr "Oddíly:"
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sektorů"
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -8376,59 +8411,39 @@ msgstr ""
 "Zapisování tabulky oddílů %(primary_first)d %(primary_last)d do "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Zapisování tabulky oddílů %s dokončeno."
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-"Nástroje XenServer instalované v tomto obrazu jsou schopné vložit sítě. "
-"Síťové soubory nebudou změněny"
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-"Nástroje XenServer jsou v tomto obrazu přítomny, ale nejsou schopny "
-"vložit síť"
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr "Nástroje XenServer nejsou v tomto obrazu nainstalovány"
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr "Přímé zacházení se soubory rozhraní"
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, 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:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
@@ -8438,200 +8453,200 @@ msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
 msgid "Starting instance"
 msgstr "Spouštění instance..."
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Odstraňování souborů kernel/ramdisku z dom0"
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Nelze aktualizovat svazek v db"
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 "Automatické nastavení disku pro instanci %(instance_uuid)s, pokus o změnu"
 " velikosti oddílu..."
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 #, fuzzy
 msgid "Starting VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "Psled v agenta pro %(hypervisor)s/%(os)s/%(architecture)s je %(version)s"
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "Nenalezena žádná verze agenta pro %(hypervisor)s/%(os)s/%(architecture)s"
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Verze agenta instance: %s"
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr "Nastavování váhy VCPU"
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "Nelze najít odkaz na VDI"
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Dokončen snímek a nahrání na VM %s"
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr "Nelze převést vhd na nového hostitele"
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, fuzzy, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Zmenšení velikosti VDI %(cow_uuid)s z %(old_gb)d GB na %(new_gb)d GB"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Zvětšení velikosti VDI %(vdi_uuid)s z%(old_gb)d GB na %(new_gb)d GB"
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 #, fuzzy
 msgid "Resize complete"
 msgstr "Změna velikosti %s je hotova"
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Neůze najít vbd pro vdi %s"
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, fuzzy, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 "Instance %(instance_uuid)s pomocí RAW nebo VHD, přeskakování mazání "
 "kernelu a ramdisku"
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "Instance mí kernel nebo ramdisk, ale ne oba"
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr "soubory kernel/ramdisk odstraněny"
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr "VM není přítomno, přeskakování ničení..."
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Instance již je v záchranném režimu: %s"
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 #, fuzzy
 msgid "VM is not present, skipping power off..."
 msgstr "VM není přítomno, přeskakování ničení..."
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, 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/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "Automatický tvrdý restart %d"
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "Vkládání informací o síti do xs pro vm: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "vytváření VIF pro VM %(vm_ref)s, síť %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 #, fuzzy
 msgid "Injecting hostname to xenstore"
 msgstr "Vkládání názvu hostitele do xs pro vm: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "Vytvoření selhalo"
@@ -8664,7 +8679,7 @@ msgid "introducing sr within volume_utils"
 msgstr "Zavádění sr uvnitř nástrojů svazku"
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "Zavedeno %(label)s jako %(sr_ref)s."
@@ -8677,7 +8692,7 @@ msgstr "Vytváření pbd pro SR"
 msgid "Plugging SR"
 msgstr "Zapojování SR"
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr "NElze zavést repozitář úložiště"
 
@@ -8739,12 +8754,17 @@ msgstr "Chyb při hledání vdi v SR %s"
 msgid "Unable to find vbd for vdi %s"
 msgstr "Neůze najít vbd pro vdi %s"
 
-#: nova/virt/xenapi/volume_utils.py:304
-#, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volume_utils.py:281
+#, fuzzy, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr "Nelze získat informace o cíli %(data)s, %(mountpoint)s"
+
+#: nova/virt/xenapi/volume_utils.py:309
+#, fuzzy, python-format
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr "Nelze získat informace o cíli %(data)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Bod připojení nelze přeložit: %s"
@@ -8793,47 +8813,47 @@ msgstr "SR %s nenalezeno v databázoi xapi"
 msgid "Could not forget SR"
 msgstr "Nelze zapomenou na SR"
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Nelze vytvořit VDI na SR %(sr_ref)s pro instanci %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Nelze použít SR %(sr_ref)s pro instanci %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Bod připojení %(mountpoint)s připojen k instanci %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Odpojení svazku: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Nelze nalézt svazek %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Nelze odpojit svazek %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr "Nelze zničit vbd %s"
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr "Chyba při čištění SR %s"
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Bod připojení %(mountpoint)s odpojen od instance %(instance_name)s"
@@ -9406,40 +9426,40 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr "Zadat san_password nebo san_private_key"
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr "san_ip musí být nastaveno"
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "LUID pro %(zfs_poolname)s nenalezeno. Výstup=%(out)s"
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr "Příkaz QLID vrátil %s"
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr "Poškozená odpověď pro příkaz QLID %(verb)s %(cliq_args)s. Výsledek=%(out)s"
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr "Chyba při spouštění příkazu QLID %(verb)s %(cliq_args)s. Výsledek=%(out)s"
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
@@ -9448,12 +9468,12 @@ msgstr ""
 "Neočekávaný počet virtuálních ip pro klastr %(cluster_name)s. "
 "Výsledek=%(_xml)s"
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr "Informace o svazku: %(volume_name)s => %(volume_attributes)s"
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr "místní cesta není podporována"
 
@@ -10230,3 +10250,30 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "podpůrná vrstva: %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr "Neplatný stav serveru: %(status)s"
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr "Použití prázdného kontextu požadavku je zastaralé"
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index eee7485e6..51cca7fd6 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -184,158 +184,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,132 +347,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr ""
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -476,734 +480,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1345,138 +1349,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1888,14 +1880,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1923,7 +1915,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2186,222 +2178,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2409,19 +2396,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2912,7 +2899,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2965,184 +2952,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3151,487 +3138,495 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3858,54 +3853,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4200,7 +4191,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4208,39 +4223,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4248,89 +4263,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4408,26 +4423,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5052,19 +5060,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5147,12 +5155,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5169,17 +5177,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5203,59 +5211,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5368,7 +5376,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5395,16 +5403,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5600,7 +5608,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5615,7 +5623,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6153,7 +6161,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6178,7 +6186,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
@@ -6213,7 +6221,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6331,220 +6339,220 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6554,51 +6562,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6639,127 +6647,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6788,31 +6796,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6832,19 +6840,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7414,150 +7422,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7659,423 +7683,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8084,181 +8096,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8290,7 +8302,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8303,7 +8315,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8365,12 +8377,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8419,47 +8436,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9017,52 +9034,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9831,3 +9848,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 90230b782..54e75dafb 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -189,158 +189,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -348,133 +352,133 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "Instanz %s: Rettung"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -482,734 +486,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1351,138 +1355,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Führe Kommando (subprocess) aus: %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1894,14 +1886,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1929,7 +1921,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2192,222 +2184,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2415,19 +2402,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2918,7 +2905,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2971,184 +2958,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3157,490 +3144,498 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "Instanz wurde bereits erstellt"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3867,54 +3862,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4209,7 +4200,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4217,39 +4232,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4257,89 +4272,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4417,26 +4432,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5061,19 +5069,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5156,12 +5164,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5178,17 +5186,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5212,59 +5220,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5377,7 +5385,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5404,16 +5412,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5609,7 +5617,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5624,7 +5632,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6163,7 +6171,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6188,7 +6196,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
@@ -6223,7 +6231,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6341,220 +6349,220 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6564,51 +6572,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6649,127 +6657,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6798,31 +6806,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6842,19 +6850,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7425,150 +7433,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7670,423 +7694,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8095,181 +8107,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8301,7 +8313,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8314,7 +8326,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8376,12 +8388,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8430,47 +8447,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9028,52 +9045,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9847,3 +9864,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index 3bf8a4eea..88d5db0a3 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -189,159 +189,164 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+#, fuzzy, python-format
+msgid "Invalid metadata size"
+msgstr "Invalid signature for user %s"
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,133 +354,133 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: rescued"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Could not find iSCSI export  for volume %s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, fuzzy, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr "Tried to remove non-existent console %(console_id)s."
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -483,735 +488,735 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, 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:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, 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:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "setting network host"
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1353,138 +1358,126 @@ msgstr "model server went away"
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, 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:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "backend %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr "You must implement __call__"
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1901,14 +1894,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1936,7 +1929,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2199,224 +2192,219 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Going to try to terminate %s"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Mountpoint cannot be translated: %s"
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2424,19 +2412,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2933,7 +2921,7 @@ msgstr "Network to push into openvpn config"
 msgid "Netmask to push into openvpn config"
 msgstr "Netmask to push into openvpn config"
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Launching VPN for %s"
@@ -2987,189 +2975,189 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorise security group ingress %s"
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3178,498 +3166,507 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "Going to try to terminate %s"
+
+#: nova/compute/manager.py:549
 #, fuzzy, python-format
 msgid "Build error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Running instances: %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 #, fuzzy
 msgid "Inject network info"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3896,55 +3893,51 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr "Use of empty request context is deprecated"
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "backend %s"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4239,7 +4232,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "Going to start terminating instances"
+
+#: nova/network/manager.py:656
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4247,39 +4264,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4287,83 +4304,83 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -4371,7 +4388,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4449,26 +4466,19 @@ msgstr "setting network host"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5096,19 +5106,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5191,12 +5201,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5213,17 +5223,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5247,59 +5257,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5412,7 +5422,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5439,16 +5449,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5646,7 +5656,7 @@ msgid "instance %s: finished toXML method"
 msgstr "instance %s: finished toXML method"
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5661,7 +5671,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6209,7 +6219,7 @@ msgstr "Deleting user %s"
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6234,7 +6244,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Detach volume %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Unable to attach volume to instance %s"
@@ -6269,7 +6279,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6387,220 +6397,220 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6610,51 +6620,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Authentication Failure: %s"
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6695,127 +6705,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6844,31 +6854,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "received %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "Re-wrote %s"
@@ -6888,19 +6898,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7475,92 +7485,108 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, fuzzy, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 #, fuzzy
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
@@ -7571,58 +7597,58 @@ msgstr ""
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/driver.py:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, 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:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Calling %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7726,68 +7752,68 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "group %s already exists"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -7796,226 +7822,230 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, 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:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, 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:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -8024,130 +8054,114 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8157,185 +8171,185 @@ msgstr ""
 msgid "Starting instance"
 msgstr "Creating a raw instance"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 #, fuzzy
 msgid "Starting VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Finished snapshot and upload for VM %s"
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "setting network host"
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8367,7 +8381,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "Introduced %(label)s as %(sr_ref)s."
@@ -8380,7 +8394,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8442,12 +8456,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Mountpoint cannot be translated: %s"
@@ -8496,47 +8515,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
@@ -9098,52 +9117,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9917,3 +9936,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "backend %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr "Use of empty request context is deprecated"
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 298e634a3..de1d1d5e0 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Volume %(volume_id)s is not attached to anything"
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -189,41 +189,45 @@ msgstr "Invalid volume type"
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, 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:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -232,16 +236,16 @@ msgstr ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -250,101 +254,101 @@ msgstr ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 
-#: nova/exception.py:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -352,133 +356,133 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: resuming"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Unable to locate volume %s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -486,735 +490,735 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, 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:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, 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:797
+#: nova/exception.py:801
 #, 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:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1356,138 +1360,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, 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:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "backend %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1900,14 +1892,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1935,7 +1927,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2198,222 +2190,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2421,19 +2408,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2926,7 +2913,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2979,184 +2966,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3165,495 +3152,503 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "VBD not found in instance %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3880,55 +3875,51 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr "Use of empty request context is deprecated"
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "backend %s"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4223,7 +4214,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "Instance %(instance_id)s is not running."
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, fuzzy, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr "Instance %(instance_id)s is not running."
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4231,39 +4246,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4271,89 +4286,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4431,26 +4446,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5078,19 +5086,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5173,12 +5181,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5195,17 +5203,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5229,59 +5237,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5394,7 +5402,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5421,16 +5429,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5626,7 +5634,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5641,7 +5649,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6188,7 +6196,7 @@ msgstr "Re-exporting %s volumes"
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6213,7 +6221,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Unable to attach volume to instance %s"
@@ -6248,7 +6256,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6366,221 +6374,221 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "User does not have admin privileges"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6590,51 +6598,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6675,127 +6683,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6824,31 +6832,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6868,19 +6876,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7453,150 +7461,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, 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:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Calling %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7700,68 +7724,68 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -7770,225 +7794,229 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, 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:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -7997,130 +8025,114 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8130,181 +8142,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, fuzzy, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8336,7 +8348,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8349,7 +8361,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8411,12 +8423,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8465,47 +8482,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
@@ -9066,52 +9083,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9885,3 +9902,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "backend %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr "Use of empty request context is deprecated"
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 97ef75ae6..ce9739e00 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+0000\n"
 "PO-Revision-Date: 2012-09-13 10:30+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Volume %(volume_id)s is still attached, detach volume first."
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
@@ -189,41 +189,46 @@ msgstr "Invalid volume type"
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "Invalid metadata"
 
 #: nova/exception.py:267
+#, fuzzy
+msgid "Invalid metadata size"
+msgstr "Invalid metadata key"
+
+#: nova/exception.py:271
 #, 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:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 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:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -232,16 +237,16 @@ msgstr ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Group not valid. Reason: %(reason)s"
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr "Sort key supplied was not valid."
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -250,63 +255,63 @@ msgstr ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 
-#: nova/exception.py:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, 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:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s is not ready"
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr "Failed to suspend instance"
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr "Failed to resume server"
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr "Failed to reboot instance"
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr "Failed to terminate instance"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr "Service is unavailable at this time."
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr "Insufficient compute resources."
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr "Compute service is unavailable at this time."
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, 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:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr "The supplied hypervisor type of is invalid."
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 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:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -315,31 +320,31 @@ msgstr ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "The supplied device path (%(path)s) is invalid."
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, 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:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "The supplied device (%(device)s) is busy."
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr "Unacceptable CPU info"
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, 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:391
+#: nova/exception.py:395
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -348,7 +353,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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -359,75 +364,75 @@ msgstr ""
 "the desired physical adapter. Expected vSwitch is %(expected)s, but the "
 "one associated is %(actual)s."
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Disk format %(disk_format)s is not acceptable"
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Image %(image_id)s is unacceptable: %(reason)s"
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Instance %(instance_id)s is unacceptable: %(reason)s"
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s is unacceptable."
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr "Expected a uuid but received %(uuid)s."
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr "Constraint not met."
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr "Resource could not be found."
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Could not find driver for connection_type %(name)s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr "Volume %(volume_id)s persistence file could not be found."
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Volume %(volume_id)s could not be found."
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "Unable to locate account %(account_name)s on Solidfire device"
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Volume type %(volume_type_id)s could not be found."
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Volume type with name %(volume_type_name)s could not be found."
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -436,57 +441,57 @@ msgstr ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snapshot %(snapshot_id)s could not be found."
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "deleting volume %(volume_name)s that has snapshot"
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr "deleting snapshot %(snapshot_name)s that has dependent volumes"
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, 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:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Failed to create iscsi target for volume %(volume_id)s."
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr "Failed to remove iscsi target for volume %(volume_id)s."
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "No disk at %(location)s"
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, 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:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Invalid image href %(image_href)s."
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Image %(image_id)s could not be found."
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -497,55 +502,55 @@ msgstr ""
 " dynamically when they are listed for the first time. Have you listed "
 "image ids since adding this image?"
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Project %(project_id)s could not be found."
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "Cannot find SR to read/write VDI."
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Network %(network_id)s is still in use."
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s is required to create a network."
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Network %(network_id)s could not be found."
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, 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:542
+#: nova/exception.py:546
 #, 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:546
+#: nova/exception.py:550
 #, 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:550
+#: nova/exception.py:554
 #, 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:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "No networks defined."
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -554,51 +559,51 @@ msgstr ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 
-#: nova/exception.py:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "Host is not set to the network (%(network_id)s)."
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 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:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Port %(port_id)s is still in use."
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr "Port %(port_id)s could not be found."
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "No fixed IP associated with id %(id)s."
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Fixed ip not found for address %(address)s."
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Instance %(instance_uuid)s has zero fixed ips."
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, 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:596
+#: nova/exception.py:600
 #, 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:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
@@ -607,7 +612,7 @@ msgstr ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
@@ -616,122 +621,122 @@ msgstr ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Fixed IP address %(address)s is invalid."
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr "Zero fixed ips available."
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr "Zero fixed ips could be found."
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Floating ip %(address)s already exists."
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Floating ip not found for id %(id)s."
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, 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:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Floating ip not found for address %(address)s."
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Floating ip not found for host %(host)s."
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "Floating ip not found for address %(address)s."
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "No floating_ip found"
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr "Zero floating ips available."
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "Floating ip %(address)s is associated."
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "Floating ip %(address)s is not associated."
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr "Zero floating ips exist."
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s not found."
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, 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:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Certificate %(certificate_id)s not found."
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s could not be found."
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Compute host %(host)s could not be found."
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, 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:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
@@ -740,56 +745,56 @@ msgstr ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr "Quota could not be found"
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "Unknown quota resources %(unknown)s."
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, 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:731
+#: nova/exception.py:735
 #, 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:735
+#: nova/exception.py:739
 #, 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:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Quota reservation %(uuid)s could not be found."
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Quota exceeded for resources: %(overs)s"
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Security group %(security_group_id)s not found."
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, 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:756
+#: nova/exception.py:760
 #, 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:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -798,7 +803,7 @@ msgstr ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -807,22 +812,22 @@ msgstr ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Migration %(migration_id)s could not be found."
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, 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:779
+#: nova/exception.py:783
 #, 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:783
+#: nova/exception.py:787
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -831,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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Console %(console_id)s could not be found."
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, 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:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
@@ -850,52 +855,52 @@ msgstr ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Invalid console type %(console_type)s "
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, 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:810
+#: nova/exception.py:814
 #, 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:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Flavor %(flavor_id)s could not be found."
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr "Flavor access not found for %(flavor_id) / %(project_id) combination."
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, 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:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr "Scheduler cost function %(cost_fn_str)s could not be found."
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr "Scheduler weight flag not found: %(flag_name)s"
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, 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:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -904,7 +909,7 @@ msgstr ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -913,63 +918,63 @@ msgstr ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "File %(file_path)s could not be found."
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr "Zero files could be found."
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, 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:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Network adapter %(adapter)s could not be found."
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, 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:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr "Action not allowed."
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr "Rotation is not allowed for snapshots"
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr "Rotation param is required for backup image_type"
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "Key pair %(key_name)s already exists."
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s already exists."
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Instance Type %(name)s already exists."
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Instance Type %(name)s already exists."
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
@@ -978,80 +983,80 @@ msgstr ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "Volume Type %(name)s already exists."
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, 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:914
+#: nova/exception.py:918
 #, 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:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr "Migration error"
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Malformed message body: %(reason)s"
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Could not find config at %(path)s"
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, 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:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr "When resizing, instances must change flavor!"
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr "Image is larger than instance type allows"
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 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:948
+#: nova/exception.py:952
 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:952
+#: nova/exception.py:956
 #, 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:956
+#: nova/exception.py:960
 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:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "No valid host was found. %(reason)s"
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Host %(host)s is not up or doesn't exist."
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr "Quota exceeded"
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
@@ -1060,45 +1065,45 @@ msgstr ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 
-#: nova/exception.py:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr "Maximum volume size exceeded"
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr "Maximum number of volumes allowed (%(allowed)d) exceeded"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Maximum number of metadata items exceeds %(allowed)d"
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr "Personality file limit exceeded"
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr "Personality file path too long"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr "Personality file content too long"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr "Maximum number of key pairs exceeded"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Maximum number of security groups or rules exceeded"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
@@ -1107,128 +1112,128 @@ msgstr ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Aggregate %(aggregate_id)s could not be found."
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Aggregate %(aggregate_name)s already exists."
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, 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:1033
+#: nova/exception.py:1037
 #, 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:1038
+#: nova/exception.py:1042
 #, 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:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "Detected more than one volume with name %(vol_name)s"
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr "Bad or unexpected response from the storage volume backend API: %(data)s"
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr "Unknown NFS exception"
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr "No mounted NFS shares found"
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr "There is no share which can host %(volume_size)sG"
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr "Unable to create instance type"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, 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:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr "Bad response from SolidFire API"
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "Error in SolidFire API response: data=%(data)s"
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Detected existing vlan with id %(vlan)d"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Image %(image_id)s could not be found."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr "Invalid id: %(val)s (expecting \"i-...\")."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, 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:1110
+#: nova/exception.py:1114
 #, 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:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_uuid)s is locked"
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, 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:1123
+#: nova/exception.py:1127
 #, 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:1128
+#: nova/exception.py:1132
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
@@ -1237,11 +1242,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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr "User data needs to be valid base 64."
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
@@ -1250,12 +1255,12 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, 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:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "The CRL file for %(project)s could not be found"
@@ -1397,141 +1402,126 @@ msgstr "model server went away"
 msgid "serve() can only be called once"
 msgstr "serve() can only be called once"
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Got unknown keyword args to utils.execute: %r"
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r failed. Retrying."
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr "Environment not supported over SSH"
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr "process_input not supported over SSH"
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, 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:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "backend %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr "in looping call"
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr "Could not release the acquired lock `%s`"
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Expected object of type: %s"
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Invalid server_string: %s"
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' took %(total_time).2f secs"
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr "Reloading cached file %s"
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Could not remove tmpdir: %s"
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr "%(name)s listening on %(host)s:%(port)s"
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr "Stopping WSGI server."
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr "WSGI server has stopped."
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr "You must implement __call__"
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr "Loading app %(name)s from %(path)s"
@@ -1947,7 +1937,7 @@ msgstr "Must specify an ExtensionManager class"
 msgid "Extended resource: %s"
 msgstr "Extended resource: %s"
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
@@ -1956,7 +1946,7 @@ msgstr ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Extension %(ext_name)s extending resource: %(collection)s"
@@ -1986,7 +1976,7 @@ msgstr "offset param must be an integer"
 msgid "offset param must be positive"
 msgstr "offset param must be positive"
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr "marker [%s] not found"
@@ -2252,222 +2242,217 @@ msgstr "This request was rate-limited."
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr "Server does not exist"
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr "Metadata item was not found"
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr "Instance could not be found"
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr "Invalid server status: %(status)s"
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr "Invalid changes-since value"
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr "Only administrators may list deleted instances"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr "Server name is not a string or unicode"
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr "Server name is an empty string"
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr "Server name must be less than 256 characters."
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "Bad personality format: missing %s"
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr "Bad personality format"
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "Personality content for %s cannot be decoded"
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr "Unknown argment : port"
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr "Bad port format: port uuid is not in proper format (%s)"
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "Bad networks format: network uuid is not in proper format (%s)"
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "Invalid fixed IP address (%s)"
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Duplicate networks (%s) are not allowed"
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Bad network format: missing %s"
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr "Bad networks format"
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr "Userdata content cannot be decoded"
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 is not proper IPv4 format"
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr "accessIPv6 is not proper IPv6 format"
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr "Server name is not defined"
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr "Invalid flavorRef provided."
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr "min_count must be an integer value"
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr "min_count must be > 0"
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr "max_count must be an integer value"
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr "max_count must be > 0"
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr "min_count must be <= max_count"
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr "Can not find requested image"
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr "Invalid key_name provided."
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr "HostId cannot be updated."
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr "Instance has not been resized."
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr "Error in confirm-resize %s"
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr "Error in revert-resize %s"
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 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:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr "Missing argument 'type' for reboot"
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr "Error in reboot %s"
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr "Unable to locate requested flavor."
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr "Resize requires a flavor change."
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr "Missing imageRef attribute"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr "Invalid imageRef provided."
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr "Missing flavorRef attribute"
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr "No adminPass was specified"
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr "Invalid adminPass"
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Unable to parse metadata key/value pairs."
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Resize request has invalid 'flavorRef' attribute."
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Resize requests require 'flavorRef' attribute."
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2475,19 +2460,19 @@ msgstr "Resize requests require 'flavorRef' attribute."
 msgid "Invalid request body"
 msgstr "Invalid request body"
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr "Could not parse imageRef from request."
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr "Cannot find image for rebuild"
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr "createImage entity requires name attribute"
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Removing options '%(unk_opt_str)s' from query"
@@ -2985,7 +2970,7 @@ msgstr "Network to push into openvpn config"
 msgid "Netmask to push into openvpn config"
 msgstr "Netmask to push into openvpn config"
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Launching VPN for %s"
@@ -3042,67 +3027,67 @@ msgstr "Metadata property key greater than 255 characters"
 msgid "Metadata property value greater than 255 characters"
 msgstr "Metadata property value greater than 255 characters"
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to soft delete instance"
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr "No host for instance, deleting immediately"
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 #, fuzzy
 msgid "host for instance is down, deleting from database"
 msgstr "No host for instance, deleting immediately"
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate instance"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr "Going to try to stop instance"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr "Going to try to start instance"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "Searching by: %s"
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "Image type not recognized %s"
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr "snapshot for %s"
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id is None. Assuming migration."
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -3111,47 +3096,47 @@ msgstr ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr "Locking"
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr "Unlocking"
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr "Volume must be attached in order to detach."
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, 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:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr "Keypair name contains unsafe characters"
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 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:2268
+#: nova/compute/api.py:2272
 #, 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:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Security group %s cannot be empty."
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -3160,71 +3145,71 @@ msgstr ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, 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:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr "Quota exceeded, too many security groups."
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr "Security group is still in use"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr "Failed to update usages deallocating security group"
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Rule (%s) not found"
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr "Quota exceeded, too many security group rules."
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress %s"
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr "names can only contain [a-zA-Z0-9_.- ]"
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr "create arguments must be positive integers"
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Instance type %s not found for deletion"
@@ -3233,77 +3218,86 @@ msgstr "Instance type %s not found for deletion"
 msgid "Possibly task preempted."
 msgstr "Possibly task preempted."
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr "Loading compute driver '%s'"
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Unable to load the virtualization driver: %s"
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 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:297
+#: nova/compute/manager.py:301
 #, 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:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Rebooting instance after nova-compute restart."
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Hypervisor driver does not support resume guests"
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Hypervisor driver does not support firewall rules"
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr "Checking state"
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Setting up bdm %s"
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "Deallocating network for instance"
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr "Build error: %s"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr "Retry info not present, will not reschedule"
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr "Re-scheduling instance: attempt %d"
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr "Instance build timed out. Set to error state."
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3312,7 +3306,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3321,71 +3315,71 @@ msgstr ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr "Starting instance..."
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr "Instance failed network setup"
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Instance network_info: |%s|"
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr "Instance failed block device setup"
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr "Deallocating network for instance"
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s instance"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignoring DiskNotFound: %s"
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignoring VolumeNotFound: %s"
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr "terminating bdm %s"
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Setting instance vm_state to ERROR"
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr "Rebuilding instance"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr "Rebooting instance"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3394,16 +3388,16 @@ msgstr ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Cannot reboot instance: %(exc)s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr "instance snapshotting"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3412,44 +3406,44 @@ msgstr ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Found %(num_images)d images (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Rotating out %d backups"
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr "Deleting image %s"
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, 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:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr "Root password set"
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr "set_admin_password is not implemented by this driver."
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password failed: %s"
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr "error setting admin password"
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
@@ -3458,80 +3452,80 @@ msgstr ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr "injecting file to %(path)s"
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr "Rescuing"
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr "Unrescuing"
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr "Changing instance metadata according to %(diff)r"
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr "destination same as source!"
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr "Migrating"
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr "Pausing"
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr "Unpausing"
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr "Retrieving diagnostics"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr "Resuming"
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr "Reset network"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr "Inject network info"
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info to inject: |%s|"
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr "Get console output"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, 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:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "Attaching volume %(volume_id)s to %(mountpoint)s"
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
@@ -3540,47 +3534,47 @@ msgstr ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, 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:2077
+#: nova/compute/manager.py:2120
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "Faild to detach volume %(volume_id)s from %(mp)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr "Instance has no volume."
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "Pre live migration failed at  %(dest)s"
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr "_post_live_migration() is started.."
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr "No floating_ip found"
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr "No floating_ip found."
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3589,12 +3583,12 @@ msgstr ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "Migrating instance to %(dest)s finished successfully."
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3602,15 +3596,15 @@ 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr "Post operation of migration started"
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr "Updated the info_cache for instance"
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -3619,12 +3613,12 @@ msgstr ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, 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:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
@@ -3633,26 +3627,26 @@ msgstr ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Instance %(instance_uuid)s not found"
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr "In ERROR state"
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr "Error auto-confirming resize: %(e)s. Will retry later."
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
@@ -3661,20 +3655,20 @@ 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:2575
+#: nova/compute/manager.py:2629
 #, 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:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr "Updating host status"
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3683,11 +3677,11 @@ msgstr ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 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:2720
+#: nova/compute/manager.py:2774
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
@@ -3696,36 +3690,36 @@ msgstr ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 
-#: nova/compute/manager.py:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr "Instance shutdown by itself. Calling the stop API."
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr "error during stop() in sync_power_state."
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr "Instance is not stopped. Calling the stop API."
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance is not (soft-)deleted."
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, skipping..."
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr "Reclaiming deleted instance"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -3734,7 +3728,7 @@ msgstr ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -3743,7 +3737,7 @@ msgstr ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
@@ -3980,54 +3974,50 @@ msgstr "Received Token: %(token)s, %(token_dict)s)"
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "Checking Token: %(token)s, %(token_valid)s)"
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr "Use of empty request context is deprecated"
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Unrecognized read_deleted value '%s'"
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, 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:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr "Backend exists"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "No backend config with id %(sm_backend_id)s"
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr "No backend config with sr uuid %(sr_uuid)s"
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr "Flavor exists"
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr "%(sm_flavor_id) flavor not found"
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr "No sm_flavor called %(sm_flavor_id)s"
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr "No sm_flavor called %(sm_flavor_label)s"
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "No sm_volume with id %(volume_id)s"
@@ -4326,7 +4316,37 @@ msgstr "Quota exceeded for %(pid)s, tried to allocate floating IP"
 msgid "Failed to update usages deallocating floating IP"
 msgstr "Failed to update usages deallocating floating IP"
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "Destroying VDIs for Instance %(instance_uuid)s"
+
+#: nova/network/manager.py:656
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+"Fixed IP address %(address)s is already in use on instance "
+"%(instance_uuid)s."
+
+#: nova/network/manager.py:677
+#, fuzzy, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+"Automatically confirming migration %(migration_id)s for instance "
+"%(instance_uuid)s"
+
+#: nova/network/manager.py:685
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+"Fixed IP address %(address)s is already in use on instance "
+"%(instance_uuid)s."
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4337,39 +4357,39 @@ msgstr ""
 "not visible to either the floating or instance DNS driver. It will be "
 "ignored."
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "Disassociated %s stale fixed ip(s)"
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr "network allocations"
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr "networks retrieved for instance: |%(networks)s|"
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr "network deallocation for instance"
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4380,51 +4400,51 @@ msgstr ""
 "|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
 "created."
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr "Unable to release %s because vif doesn't exist."
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Leased IP |%(address)s|"
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "IP %s leased that is not associated"
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "IP |%s| leased that isn't allocated"
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Released IP |%(address)s|"
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "IP %s released that is not associated"
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr "%s must be an integer"
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr "Maximum allowed length for 'label' is 255."
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
@@ -4433,16 +4453,16 @@ msgstr ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr "cidr already in use"
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -4451,16 +4471,16 @@ msgstr ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr "Network already exists!"
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Network must be disassociated from project %s before delete"
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -4468,7 +4488,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4548,30 +4568,21 @@ msgstr "Floating ip not found for id %(id)s."
 msgid "syslog facility must be one of: %s"
 msgstr "syslog facility must be one of: %s"
 
-#: nova/openstack/common/policy.py:149
-#, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
-msgstr ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
-
-#: nova/openstack/common/policy.py:163
-#, python-format
-msgid "Failed to understand rule %(match)r"
+#: nova/openstack/common/policy.py:394
+#, fuzzy, python-format
+msgid "Failed to understand rule %(rule)s"
 msgstr "Failed to understand rule %(match)r"
 
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
-msgstr "Inheritance-based rules are deprecated; update _check_%s"
-
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:404
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr "No handler for matches of kind %s"
 
+#: nova/openstack/common/policy.py:679
+#, fuzzy, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr "Failed to understand rule %(match)r"
+
 #: nova/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -5223,19 +5234,19 @@ msgstr "already attached"
 msgid "already detached"
 msgstr "already detached"
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr "Please extend mock libvirt module to support flags"
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr "Expected a list for 'auth' parameter"
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr "Expected a function in 'auth[0]' parameter"
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr "Expected a function in 'auth[1]' parameter"
 
@@ -5326,12 +5337,12 @@ msgstr "Given data: %s"
 msgid "Result data: %s"
 msgstr "Result data: %s"
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Creating files in %s to simulate guest agent"
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Removing simulated guest agent files in %s"
@@ -5348,7 +5359,7 @@ msgstr "200 No Roles"
 msgid "unexpected role header"
 msgstr "unexpected role header"
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
@@ -5356,11 +5367,11 @@ msgstr ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 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:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 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"
 
@@ -5384,59 +5395,59 @@ msgstr "_get: %s"
 msgid "_get_all: %s"
 msgstr "_get_all: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr "test_snapshot_create: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr "test_snapshot_create: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr "test_snapshot_create_force: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr "test_snapshot_create_force: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr "test_snapshot_show: resp=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr "test_snapshot_detail: resp_dict=%s"
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr "Internal error"
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "After force-killing instances: %s"
@@ -5558,7 +5569,7 @@ msgstr "Unexpected status code"
 msgid "Decoding JSON: %s"
 msgstr "Decoding JSON: %s"
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr "Added %(filepath)s to config drive"
@@ -5585,16 +5596,16 @@ msgstr "Adding security group rule: %r"
 msgid "Adding provider rule: %s"
 msgstr "Adding provider rule: %s"
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info' parsing failed."
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr "fmt=%(fmt)s backed by: %(backing_file)s"
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Converted to raw, but format is now %s"
@@ -5792,7 +5803,7 @@ msgid "instance %s: finished toXML method"
 msgstr "instance %s: finished toXML method"
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5809,7 +5820,7 @@ msgstr "#### RLK: cpu_arch = %s "
 msgid "Updating!"
 msgstr "Updating!"
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Updating host stats"
@@ -6363,7 +6374,7 @@ msgstr "Creating folder %s "
 msgid "Removing existing folder %s "
 msgstr "Removing existing folder %s "
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr "block device info: %s"
@@ -6388,7 +6399,7 @@ msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Attach volume failed: %s"
 msgstr "Attach volume failed: %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Unable to attach volume to instance %s"
@@ -6423,7 +6434,7 @@ msgstr "Physical disk detached is: %s"
 msgid "Failed to remove volume from VM %s"
 msgstr "Failed to remove volume from VM %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr "Could not determine iscsi initiator name"
 
@@ -6541,153 +6552,153 @@ msgstr "An error has occurred when calling the iscsi initiator: %s"
 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/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, 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:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, 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:468
+#: nova/virt/libvirt/driver.py:466
 #, 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:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr "During wait destroy, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr "Instance destroyed successfully."
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr "Error from libvirt during undefineFlags. Retrying with undefine"
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, 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:537
+#: nova/virt/libvirt/driver.py:535
 #, 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:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "Deleting instance files %(target)s"
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, 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:718
+#: nova/virt/libvirt/driver.py:728
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "During wait destroy, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr "attaching LXC block device"
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr "detaching LXC block device"
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr "Instance soft rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr "Failed to soft reboot instance."
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr "Instance shutdown successfully."
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr "Instance rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr "Instance is running"
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr "Instance spawned successfully."
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr "Guest does not have a console available"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr "Path '%(path)s' supports direct I/O"
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, 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:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, 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:1248
-msgid "Using config drive"
-msgstr "Using config drive"
-
-#: nova/virt/libvirt/driver.py:1267
+#: nova/virt/libvirt/driver.py:1275
 msgid "Creating image"
 msgstr "Creating image"
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
+msgstr "Using config drive"
+
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Creating config drive at %(path)s"
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr "Injecting %(injection)s into image %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring 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:1500
+#: nova/virt/libvirt/driver.py:1509
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
@@ -6696,20 +6707,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:1506
+#: nova/virt/libvirt/driver.py:1515
 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:1510
+#: nova/virt/libvirt/driver.py:1519
 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:1514
+#: nova/virt/libvirt/driver.py:1523
 #, 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:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
@@ -6717,15 +6728,15 @@ msgstr ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr "Starting toXML method"
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr "Finished toXML method"
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -6734,19 +6745,19 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2097
+#: nova/virt/libvirt/driver.py:2104
 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:2284
+#: nova/virt/libvirt/driver.py:2291
 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:2292
+#: nova/virt/libvirt/driver.py:2299
 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:2330
+#: nova/virt/libvirt/driver.py:2337
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -6755,7 +6766,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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -6764,7 +6775,7 @@ msgstr ""
 "Instance launched has CPU info:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6779,7 +6790,7 @@ msgstr ""
 "\n"
 "Refer to %(u)s"
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -6788,44 +6799,44 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:2427
+#: nova/virt/libvirt/driver.py:2434
 #, 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:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Live Migration failure: %(e)s"
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "skipping %(path)s since it looks like volume"
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, 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:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Starting migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr "Instance running successfully."
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr "Starting finish_migration"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr "Starting finish_revert_migration"
 
@@ -6868,22 +6879,22 @@ msgstr "You should specify libvirt_images_volume_group flag to use LVM images."
 msgid "Unknown image_type=%s"
 msgstr "Unknown image_type=%s"
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s is a valid instance name"
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s has a disk file"
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "Instance %(instance)s is backed by %(backing)s"
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
@@ -6892,42 +6903,42 @@ msgstr ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 
-#: nova/virt/libvirt/imagecache.py:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr "%(id)s (%(base_file)s): image verification failed"
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr "Cannot remove %(base_file)s, it does not exist"
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "Base file too young to remove: %s"
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr "Removing base file: %s"
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "Failed to remove %(base_file)s, error was %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr "%(id)s (%(base_file)s): checking"
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
@@ -6936,7 +6947,7 @@ msgstr ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
@@ -6945,56 +6956,56 @@ msgstr ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr "%(id)s (%(base_file)s): image is not in use"
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr "%(id)s (%(base_file)s): image is in use"
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "Skipping verification, no base directory at %s"
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr "Verify base images"
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr "Image id %(id)s yields fingerprint %(fingerprint)s"
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "Unknown base file: %s"
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr "Active base files: %s"
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "Corrupt base files: %s"
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr "Removable base files: %s"
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr "Verification complete"
 
@@ -7028,31 +7039,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr "Reading image info file: %s"
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr "Read: %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr "Error reading image info file %(filename)s: %(error)s"
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr "Writing image info file: %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr "Wrote: %s"
@@ -7072,12 +7083,12 @@ msgstr "Ensuring bridge %s"
 msgid "Failed while unplugging vif"
 msgstr "Failed while unplugging vif"
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI device not found at %s"
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -7086,7 +7097,7 @@ msgstr ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
@@ -7681,12 +7692,12 @@ msgstr "Getting image size for the image %s"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Got image size of %(size)s for the image %(image)s"
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, 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:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -7695,12 +7706,12 @@ msgstr ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, 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:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
@@ -7709,68 +7720,88 @@ msgstr ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr "Failed to query agent version: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr "Querying agent version"
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr "Reached maximum time attempting to query agent version"
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr "Updating agent to %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr "Failed to update agent: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr "Setting admin password"
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr "Failed to exchange keys: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr "Failed to update password: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr "Injecting file path: %r"
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr "Failed to inject file: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr "Resetting network"
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "Failed to reset network: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr "XenServer tools are not installed in this image"
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -7780,58 +7811,58 @@ msgstr ""
 "(optionally), and xenapi_connection_password to use "
 "compute_driver=xenapi.XenAPIDriver"
 
-#: nova/virt/xenapi/driver.py:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr "Failure while cleaning up attached VDIs"
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr "Could not determine key: %s"
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr "Host startup on XenServer is not supported."
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 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:662
+#: nova/virt/xenapi/driver.py:655
 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:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, 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:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Calling %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr "Calling setter %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7941,68 +7972,68 @@ msgstr ""
 "PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr "Created VM"
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr "VM destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr "VM already halted, skipping shutdown..."
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr "Shutting down VM"
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr "VBD %s already detached"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr "Reached maximum number of retries trying to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Unable to destroy VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -8011,31 +8042,36 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+#, fuzzy
+msgid "SR not present and could not be introduced"
+msgstr "Instance could not be found"
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "No primary VDI found for %(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr "Starting snapshot for VM"
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr "Destroying cached VDI '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
@@ -8044,17 +8080,17 @@ msgstr ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr "Unrecognized cache_images value '%s', defaulting to True"
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, python-format
 msgid ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
@@ -8063,32 +8099,32 @@ msgstr ""
 "download_vhd %(image_id)s, attempt %(attempt_num)d/%(max_attempts)d, "
 "params: %(params)s"
 
-#: nova/virt/xenapi/vm_utils.py:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr "download_vhd failed: %r"
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, fuzzy, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr "Invalid value '%s' for force. "
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Asking xapi to fetch vhd image %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, 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:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
@@ -8097,17 +8133,17 @@ msgstr ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, 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:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -8116,56 +8152,56 @@ msgstr ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 
-#: nova/virt/xenapi/vm_utils.py:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, 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:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr "Failed to fetch glance image"
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, 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:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "Unknown image format %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr "Unable to parse rrd of %(vm_uuid)s"
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, 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:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
@@ -8175,50 +8211,50 @@ msgstr ""
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr "Cannot find SR of content-type ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO: looking at SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr "ISO: not iso content"
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO: iso content_type, no 'i18n-key' key"
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 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:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR MATCHing our criteria"
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 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:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s disappeared"
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, 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:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR with local PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
@@ -8227,22 +8263,22 @@ msgstr ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "Unable to obtain RRD XML updates with server details: %(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "Invalid statistics data from Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -8251,75 +8287,75 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, 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:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr "Disconnecting stale VDI %s from compute domU"
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, 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:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, 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:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr "Partitions:"
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -8328,12 +8364,12 @@ msgstr ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
@@ -8342,7 +8378,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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
@@ -8351,40 +8387,20 @@ msgstr ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr "XenServer tools are not installed in this image"
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr "Manipulating interface files directly"
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, 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:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 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"
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Updating progress to %(progress)d"
@@ -8393,32 +8409,32 @@ msgstr "Updating progress to %(progress)d"
 msgid "Starting instance"
 msgstr "Starting instance"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Removing kernel/ramdisk files from dom0"
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr "Block device information present: %s"
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr "Failed to spawn, rolling back"
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr "Detected ISO image type, creating blank VM for install"
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr "Auto configuring disk, attempting to resize partition..."
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr "Starting VM"
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
@@ -8427,134 +8443,134 @@ msgstr ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr "Waiting for instance state to become running"
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Instance agent version: %s"
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr "Setting VCPU weight"
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr "Could not find VM with name %s"
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr "Finished snapshot and upload for VM"
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr "Failed to transfer vhd to new host"
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, fuzzy, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr "Resize complete"
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr "Starting halted instance found during reboot"
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Unable to find root VBD/VDI for VM"
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "Destroying VDIs for Instance %(instance_uuid)s"
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr "Using RAW or VHD, skipping kernel and ramdisk deletion"
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "instance has a kernel or ramdisk but not both"
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr "Destroying VM"
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr "VM is not present, skipping destroy..."
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Instance is already in Rescue Mode: %s"
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr "VM is not present, skipping power off..."
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, 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/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr "Automatically hard rebooting"
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr "Fetching VM ref while BUILDING failed"
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr "Injecting network info to xenstore"
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr "Creating vifs"
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creating VIF for network %(network_ref)s"
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Created VIF %(vif_ref)s, network %(network_ref)s"
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr "Injecting hostname to xenstore"
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
@@ -8563,15 +8579,15 @@ msgstr ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr "Migrate Receive failed"
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr "VM.assert_can_migratefailed"
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr "Migrate Send failed"
 
@@ -8603,7 +8619,7 @@ msgid "introducing sr within volume_utils"
 msgstr "introducing sr within volume_utils"
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "Introduced %(label)s as %(sr_ref)s."
@@ -8616,7 +8632,7 @@ msgstr "Creating pbd for SR"
 msgid "Plugging SR"
 msgstr "Plugging SR"
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr "Unable to introduce Storage Repository"
 
@@ -8678,12 +8694,17 @@ msgstr "Error finding vdis in SR %s"
 msgid "Unable to find vbd for vdi %s"
 msgstr "Unable to find vbd for vdi %s"
 
-#: nova/virt/xenapi/volume_utils.py:304
-#, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volume_utils.py:281
+#, fuzzy, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr "Unable to obtain target information %(data)s, %(mountpoint)s"
+
+#: nova/virt/xenapi/volume_utils.py:309
+#, fuzzy, python-format
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr "Unable to obtain target information %(data)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Mountpoint cannot be translated: %s"
@@ -8732,47 +8753,47 @@ msgstr "SR %s not found in the xapi database"
 msgid "Could not forget SR"
 msgstr "Could not forget SR"
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr "Error purging SR %s"
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
@@ -9349,40 +9370,40 @@ msgstr "Volume %s does not have provider_location specified, skipping"
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr "Specify san_password or san_private_key"
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr "san_ip must be set"
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr "Cannot parse list-view output: %s"
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr "CLIQ command returned %s"
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
@@ -9391,12 +9412,12 @@ msgstr ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr "Volume info: %(volume_name)s => %(volume_attributes)s"
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr "local_path not supported"
 
@@ -10293,3 +10314,39 @@ msgstr ""
 "Got error trying to delete target %(target)s, assuming it is already "
 "gone: %(exc)s"
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+
+#~ msgid "backend %s"
+#~ msgstr "backend %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr "Invalid server status: %(status)s"
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr "Use of empty request context is deprecated"
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr "Inheritance-based rules are deprecated; update _check_%s"
+
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 640cdfba7..2c30da2d9 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -171,7 +171,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Volumen %(volume_id)s no está conectado con nada"
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -195,161 +195,166 @@ msgstr "Tipo de volumen no válido"
 msgid "Invalid volume"
 msgstr "Volumen inválido"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+#, fuzzy, python-format
+msgid "Invalid metadata size"
+msgstr "Firma invalida para el usuario %s"
+
+#: nova/exception.py:271
 #, 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:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP invalido %(protocol)s"
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Tipo de contenido invalido %(content_type)s."
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Cidr %(cidr)s invalido"
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "La instacia %(instance_id)s no se esta ejecutando"
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, 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:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr "Fallo al reiniciar el servidor"
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr "El servicio no esta disponible en este momento"
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr "El servicio de computo no esta disponible en este momento"
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, 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:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr "Informacion del CPU inaceptable"
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, 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:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -357,133 +362,133 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato de disco %(disk_format)s no es aceptable"
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "La imagen %(image_id)s es inaceptable: %(reason)s"
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instancia %s: rescatada"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Imposible encontrar SR en VBD %s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -491,736 +496,736 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, 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:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "configurando la red del host"
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, 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:797
+#: nova/exception.py:801
 #, 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:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, 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:842
+#: nova/exception.py:846
 #, 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:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, 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:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1362,138 +1367,126 @@ msgstr "el servidor de modelos se ha ido"
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Ejecutando cmd (subprocesos): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "El resultado fue %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "corriendo cmd (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Depuración de la devolución de llamada: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "No se encuentra la dirección del enlace local.:%s"
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, 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:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "backend inválido: %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "backend %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1909,14 +1902,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1944,7 +1937,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2207,224 +2200,219 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Punto de montaje no puede ser traducido: %s"
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2432,19 +2420,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2941,7 +2929,7 @@ msgstr "Red a insertar en la configuración de openvpn"
 msgid "Netmask to push into openvpn config"
 msgstr "Mascara de red a insertar en la configuración de openvpn"
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Lanzando VPN para %s"
@@ -2999,189 +2987,189 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, 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:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3190,496 +3178,505 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "Vamos a ejecutar %s insntacias..."
+
+#: nova/compute/manager.py:549
 #, fuzzy, python-format
 msgid "Build error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "La instancia ha sido creada previamente"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 #, fuzzy
 msgid "Inject network info"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3906,55 +3903,51 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr "El uso de una petición de contexto vacía está en desuso"
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "backend %s"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4249,7 +4242,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "La instacia %(instance_id)s no esta suspendida"
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, fuzzy, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr "La instacia %(instance_id)s no esta suspendida"
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4257,39 +4274,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr "configurando la red del host"
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4297,89 +4314,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4457,26 +4474,19 @@ msgstr "configurando la red del host"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5105,19 +5115,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5200,12 +5210,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5222,17 +5232,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5256,59 +5266,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Después de terminar las instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5421,7 +5431,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5449,16 +5459,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5654,7 +5664,7 @@ msgid "instance %s: finished toXML method"
 msgstr "instancia %s: finalizado método toXML"
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5669,7 +5679,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6216,7 +6226,7 @@ msgstr "Borrando usuario %s"
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6241,7 +6251,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Imposible adjuntar volumen a la instancia %s"
@@ -6276,7 +6286,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6394,222 +6404,222 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr "Conexión a libvirt rota"
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6619,51 +6629,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Fallo de autenticación: %s"
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6704,127 +6714,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6853,31 +6863,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "recibido %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6897,19 +6907,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7485,92 +7495,108 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, fuzzy, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 #, fuzzy
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
@@ -7580,58 +7606,58 @@ msgstr ""
 "Debes especificar xenapi_connection_url, xenapi_connection_username "
 "(opcional), y xenapi_connection_password para usar connection_type=xenapi"
 
-#: nova/virt/xenapi/driver.py:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "Lanzando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, 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:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Llamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7735,68 +7761,68 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD no encontrado en la instancia %s"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "el grupo %s ya existe"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Imposible desconectar VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -7805,357 +7831,345 @@ msgstr ""
 "VDI creado %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "sobre %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, 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:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destruído"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Buscando vid %s para el kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s está todavía disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Ejecutando pygrub contra %s"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen Encontrado %s"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen no encontrado. Reiniciando HVM"
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8165,184 +8179,184 @@ msgstr ""
 msgid "Starting instance"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Finalizado el snapshot y la subida de la VM %s"
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, fuzzy, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "configurando la red del host"
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8374,7 +8388,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8387,7 +8401,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8449,12 +8463,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Punto de montaje no puede ser traducido: %s"
@@ -8503,51 +8522,51 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "No es posible crear el VDI en SR %(sr_ref)s para la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "No es posible usar SR %(sr_ref)s para la instancia %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "El punto de montaje %(mountpoint)s esta unido a la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Imposible desasociar volumen %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9111,52 +9130,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9930,3 +9949,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "backend %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr "El uso de una petición de contexto vacía está en desuso"
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 7cabf3221..02f9dbda8 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -169,7 +169,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Le volume %(volume_id)s n'est lié à rien"
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr "La paire de clés de donnée n'est pas valide"
 
@@ -193,41 +193,46 @@ msgstr "Type de volume invalide"
 msgid "Invalid volume"
 msgstr "Volume invalide"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+#, fuzzy, python-format
+msgid "Invalid metadata size"
+msgstr "Signature non valide pour l'utilisateur %s"
+
+#: nova/exception.py:271
 #, 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:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Le protocole IP %(protocol)s est invalide"
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Le type de contenu %(content_type)s est invalide"
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Le cidr %(cidr)s est invalide"
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -236,16 +241,16 @@ msgstr ""
 "Impossible d'effectuer l'action '%(action)s' sur l'ensemble "
 "%(aggregate_id)s. Raison: %(reason)s."
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -254,68 +259,68 @@ 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "L'instance %(instance_id)s  ne fonctionne pas."
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, 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:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "L'instance %(instance_id)s  n'est pas suspendue"
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr "Échec de la reprise du serveur"
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr "Le service est indisponible actuellement."
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr "Le service de calcul est indisponible actuellement."
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, 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:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Le type de l'hyperviseur fourni n'est pas valide."
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 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:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -324,31 +329,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:371
+#: nova/exception.py:375
 #, 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:375
+#: nova/exception.py:379
 #, 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:379
+#: nova/exception.py:383
 #, 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:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr "Info CPU inacceptable"
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, 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:391
+#: nova/exception.py:395
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -358,7 +363,7 @@ msgstr ""
 " VLAN prévu est %(tag)s, mais celui qui est associé avec le groupe de "
 "port est %(pgroup)s."
 
-#: nova/exception.py:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -369,135 +374,135 @@ msgstr ""
 "l'adaptateur physique souhaité. VSwitch est %(expected)s, mais la "
 "principale association est %(actual)s."
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, 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:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "L'image %(image_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "L'instance %(instance_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s est inaccepatble."
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: récupérée"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr "La ressource n'a pas pu être trouvée."
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Imposible de trouver une exportation iSCSI pour le volume %s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr "Le volume %(volume_id)s n'a pas pu être trouvé."
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, 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:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)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:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Le type de volume %(volume_type_id)s n'a pas été trouvé."
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Le type de volume avec le nom %(volume_type_name)s n'a pas été trouvé."
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, 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:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, 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:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, fuzzy, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Aucun disque sur %(location)s"
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, 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:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "L'image href %(image_href)s est invalide."
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, 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:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -505,55 +510,55 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, 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:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "Impossible de trouver le SR pour lire/écrire le VDI."
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, 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:530
+#: nova/exception.py:534
 #, 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:534
+#: nova/exception.py:538
 #, 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:538
+#: nova/exception.py:542
 #, 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:542
+#: nova/exception.py:546
 #, 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:546
+#: nova/exception.py:550
 #, 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:550
+#: nova/exception.py:554
 #, 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:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Aucun réseau défini."
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -562,53 +567,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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "L'hôte n'est pas configuré pour le réseau (%(network_id)s)."
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, 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:575
+#: nova/exception.py:579
 #, fuzzy, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, 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:583
+#: nova/exception.py:587
 #, 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:587
+#: nova/exception.py:591
 #, 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:591
+#: nova/exception.py:595
 #, 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:596
+#: nova/exception.py:600
 #, 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:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
@@ -617,187 +622,187 @@ msgstr ""
 "L'adresse IP fixe (%(address)s) n'existe pas dans le réseau "
 "(%(network_uuid)s)."
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, 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:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "L'adresse IP fixe %(address)s est invalide."
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr "Aucunes IPs fixes disponibles."
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr "Aucunes IPs fixes trouvées."
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, 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:640
+#: nova/exception.py:644
 #, 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:644
+#: nova/exception.py:648
 #, 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:648
+#: nova/exception.py:652
 #, 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:652
+#: nova/exception.py:656
 #, 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:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, 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:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Le certificat %(certificate_id)s non trouvé."
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, 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:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "L'hôte %(host)s ne peut pas être trouvé."
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, 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:706
+#: nova/exception.py:710
 #, 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:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, 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:731
+#: nova/exception.py:735
 #, 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:735
+#: nova/exception.py:739
 #, 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:739
+#: nova/exception.py:743
 #, 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:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, 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:751
+#: nova/exception.py:755
 #, 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:756
+#: nova/exception.py:760
 #, 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:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -806,7 +811,7 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s est déjà associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -815,95 +820,95 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s n'est pas associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, 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:774
+#: nova/exception.py:778
 #, 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:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, 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:793
+#: nova/exception.py:797
 #, 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:797
+#: nova/exception.py:801
 #, 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:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Le type de console %(console_type)s est invalide "
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, 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:810
+#: nova/exception.py:814
 #, 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:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Le Flavor %(flavor_id)s ne peut être trouvé."
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, 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:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, 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:842
+#: nova/exception.py:846
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -912,348 +917,348 @@ msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, 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:897
+#: nova/exception.py:901
 #, 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:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Une exception inconnue s'est produite."
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, 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:1094
+#: nova/exception.py:1098
 #, 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:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, 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:1114
+#: nova/exception.py:1118
 #, 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:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, 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:1147
+#: nova/exception.py:1151
 #, 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é."
@@ -1395,138 +1400,126 @@ msgstr "Le modèle de serveur à disparu"
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Le résultat était %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Execution de la cmd (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, 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:455
+#: nova/utils.py:443
 #, 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:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "backend %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr "Vous devez implémenter __call__"
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1957,14 +1950,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1992,7 +1985,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2255,224 +2248,219 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2480,19 +2468,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2991,7 +2979,7 @@ msgstr "Réseau à passer à la configuration d'openvpn"
 msgid "Netmask to push into openvpn config"
 msgstr "Masque réseau à passer à la configuration d'openvpn"
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Démarrage du VPN pour %s"
@@ -3049,189 +3037,189 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorisation du groupe de sécurité %s"
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3240,498 +3228,507 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "Va essayer d'arrêter %s"
+
+#: nova/compute/manager.py:549
 #, fuzzy, python-format
 msgid "Build error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "L'instance a déjà été crée"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Instance actives : %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 #, fuzzy
 msgid "Inject network info"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: a démarrée"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3958,55 +3955,51 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr "L'utilisation d'une requête de contexte vide est dévalué"
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "backend %s"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, fuzzy, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr "Le Flavor %(flavor_id)s ne peut être trouvé."
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4305,7 +4298,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "Volume non trouvé pour l'instance %(instance_id)s."
+
+#: nova/network/manager.py:656
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr "L'adresse IP fixe %(address)s est déjà utilisée."
+
+#: nova/network/manager.py:677
+#, fuzzy, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr "Volume non trouvé pour l'instance %(instance_id)s."
+
+#: nova/network/manager.py:685
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr "L'adresse IP fixe %(address)s est déjà utilisée."
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4313,40 +4330,40 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 #, fuzzy
 msgid "network allocations"
 msgstr "Aucun disque sur %(location)s"
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4354,89 +4371,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s libérée qui n'était pas allouée"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "La somme du nombre de réseau et le début de vlan ne peut excéder 4094"
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4514,26 +4531,19 @@ msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5162,19 +5172,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5257,12 +5267,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5279,17 +5289,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5313,59 +5323,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr "Instance actives : %s"
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Après l'arrêt d'instances : %s"
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5478,7 +5488,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5506,16 +5516,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5713,7 +5723,7 @@ msgid "instance %s: finished toXML method"
 msgstr "instance %s: fin d'éxécution de la méthode toXML"
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5728,7 +5738,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6276,7 +6286,7 @@ msgstr "Suppression de l'utilisateur %s"
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6301,7 +6311,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Impossible d'attacher le volume à l'instance %s"
@@ -6336,7 +6346,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6454,222 +6464,222 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6679,51 +6689,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Echec d'authentification : %s"
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6764,127 +6774,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6913,31 +6923,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "%s reçu"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "Ré-écriture de %s"
@@ -6957,19 +6967,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7545,92 +7555,108 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, fuzzy, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erreur OpenSSL : %s"
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 #, fuzzy
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
@@ -7641,58 +7667,58 @@ msgstr ""
 "(optionel), et xenapi_connection_password pour utiliser "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/driver.py:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "Fonction non implémentée"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, 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:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Appel %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7796,68 +7822,68 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD non trouvé dans l'instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "le groupe %s existe déjà"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Impossible de deconnecter le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -7866,227 +7892,232 @@ msgstr ""
 "VDI créé %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on"
 " %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+#, fuzzy
+msgid "SR not present and could not be introduced"
+msgstr "Le quota ne peut pas être trouvé"
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, 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:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, 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:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Noyau/Ramdisk VDI %s détruit"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, 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:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "Le VDI %s est toujours disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-parcours de SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -8095,130 +8126,114 @@ 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Connexion de VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Connexion de VBD %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruction de VBD pour la VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, 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:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Exécution de pygrub sur %s"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen %s trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Pas de kernel Xen trouvé.  Démarrage en HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Ecriture de la table de partitionnement %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8228,186 +8243,186 @@ msgstr ""
 msgid "Starting instance"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 #, fuzzy
 msgid "Starting VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Fin de l'instantané et du chargement de VM %s"
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, fuzzy, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr "Fichiers noyau/ramdisk supprimés"
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8439,7 +8454,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "%(label)s introduit comme %(sr_ref)s."
@@ -8452,7 +8467,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8514,12 +8529,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:309
+#, python-format
+msgid "Unable to obtain target information %(connection_data)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Le point de montage ne peut pas être traduit : %s"
@@ -8568,51 +8588,51 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "Impossible de créer VDI sur SR %(sr_ref)s pour l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossible d'utiliser SR %(sr_ref)s pour l'instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "Le point de montage %(mountpoint)s a été attaché à l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Impossible de détacher le volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9178,52 +9198,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9997,3 +10017,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "backend %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr "L'utilisation d'une requête de contexte vide est dévalué"
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index a68180871..f31a5cfba 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -189,159 +189,163 @@ msgstr "Tipo del volume non valido"
 msgid "Invalid volume"
 msgstr "Volume non valido"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr "Impossibile ripristinare il server"
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,133 +353,133 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "istanza %s: ripristino"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -483,735 +487,735 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1353,138 +1357,126 @@ msgstr "model server é scomparso"
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Esecuzione del comando (sottoprocesso): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Il risultato é %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Eseguendo cmd (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1896,14 +1888,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1931,7 +1923,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2194,222 +2186,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2417,19 +2404,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2923,7 +2910,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2976,186 +2963,186 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3164,494 +3151,502 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "L'istanza é stata già creata"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3878,54 +3873,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4220,7 +4211,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4228,39 +4243,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4268,89 +4283,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4428,26 +4443,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5075,19 +5083,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5170,12 +5178,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5192,17 +5200,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5226,59 +5234,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5391,7 +5399,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5419,16 +5427,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5624,7 +5632,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5639,7 +5647,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6185,7 +6193,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6210,7 +6218,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
@@ -6245,7 +6253,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6363,222 +6371,222 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6588,51 +6596,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6673,127 +6681,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6822,31 +6830,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "ricevuto %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6866,19 +6874,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7450,150 +7458,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "Sollevando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Chiamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Dichiarando la coda %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7695,424 +7719,412 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s distrutti"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Cercando vdi %s per kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8122,182 +8134,182 @@ msgstr ""
 msgid "Starting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8329,7 +8341,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8342,7 +8354,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8404,12 +8416,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8458,47 +8475,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossible creare il VDI su SR %(sr_ref)s per l'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossibile usare SR %(sr_ref)s per l'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s smontato dall'istanza %(instance_name)s"
@@ -9060,52 +9077,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9879,3 +9896,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index a1fab7e5f..371148de6 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -189,159 +189,164 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+#, fuzzy, python-format
+msgid "Invalid metadata size"
+msgstr "Invalid signature: ユーザ %s の署名が不正です。"
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,133 +354,133 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "インスタンス %s: rescued"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "ボリューム %s 用の iSCSI エクスポートが見つかりません"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, fuzzy, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr "存在しないコンソール %(console_id)s を削除しようとしました"
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -483,735 +488,735 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "インスタンス %(instance_name)s: インスタンスファイル群 %(target)s を削除しています"
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, 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:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1353,138 +1358,126 @@ msgstr "モデルサーバが消滅しました。"
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "コマンド実行(subprocess): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "コマンド実行結果： %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "コマンド（SSH)を実行: %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "コールバック中のデバッグ: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "リンクローカルアドレスが見つかりません: %s"
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "%(interface)s のローカルIPアドレスのリンクが取得できません:%(ex)s"
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "不正なバックエンドです: %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "バックエンドは %s です。"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr "__call__ を実装しなければなりません"
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1899,14 +1892,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1934,7 +1927,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2197,224 +2190,219 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "%s を停止しようとしています"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "マウントポイントを変換できません。 %s"
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2422,19 +2410,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2931,7 +2919,7 @@ msgstr "openvpnの設定に入れるネットワークの値"
 msgid "Netmask to push into openvpn config"
 msgstr "openvpnの設定に入れるネットマスクの値"
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "%s 用のVPNを起動します。"
@@ -2985,189 +2973,189 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作成します。"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3176,498 +3164,507 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "%s を停止しようとしています"
+
+#: nova/compute/manager.py:549
 #, fuzzy, python-format
 msgid "Build error: %s"
 msgstr "エラー %s をキャッチしました。"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "インスタンスは既に生成されています。"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "インスタンス %s は実行中です。"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 #, fuzzy
 msgid "Unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキューします。"
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s の診断情報を取得します。"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 #, fuzzy
 msgid "Inject network info"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "コンソールを追加しています"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "ボリュームを未知のインスタンス %s からデタッチします。"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3894,55 +3891,51 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr "Request context を空とすることは非推奨です。"
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "バックエンドは %s です。"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4237,7 +4230,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "インスタンス終了処理を開始します。"
+
+#: nova/network/manager.py:656
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4245,39 +4262,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4285,89 +4302,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "リースしていないIP %s が開放されました。"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "ネットワークの数とVLANの開始番号の和は 4094 より大きくできません。"
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4445,26 +4462,19 @@ msgstr "ネットワークホストの設定をします。"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5092,19 +5102,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5187,12 +5197,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5209,17 +5219,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5243,59 +5253,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr "インスタンス %s は実行中です。"
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "インスタンス %s を終了した後です。"
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5408,7 +5418,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5435,16 +5445,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5640,7 +5650,7 @@ msgid "instance %s: finished toXML method"
 msgstr "インスタンス %s: toXML メソッドを完了。"
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5655,7 +5665,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6203,7 +6213,7 @@ msgstr "Deleting user: ユーザ %s を削除します。"
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6228,7 +6238,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "インスタンス %s にボリュームを接続(attach)できません。"
@@ -6263,7 +6273,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6381,220 +6391,220 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr "libvirtへの接続が切れています。"
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6604,51 +6614,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "%s の認証に失敗しました。"
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6689,127 +6699,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6838,31 +6848,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "受信： %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "%s 用のブリッジインタフェースを開始します。"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "%s を再度書き込みました"
@@ -6882,19 +6892,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7469,92 +7479,108 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, fuzzy, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL エラー: %s"
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 #, fuzzy
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
@@ -7564,58 +7590,58 @@ msgstr ""
 "connection_type=xenapi を使用するには、以下の指定が必要です： xenapi_connection_url, "
 "xenapi_connection_username (オプション), xenapi_connection_password"
 
-#: nova/virt/xenapi/driver.py:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s が発生しました。"
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "NotImplemented 例外を発生させます。"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake には %s が実装されていません。"
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "%(localname)s %(impl)s を呼び出します。"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7717,68 +7743,68 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "インスタンス %s のVBDが見つかりません。"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "VBD %s の unplug に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -7787,358 +7813,346 @@ msgstr ""
 "%(sr_ref)s 上に VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "ID %(image_id)s として %(vdi_uuids)s のアップロードの為に xapi を問い合わせしています"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "ID %(image_id)s として %(vdi_uuids)s のアップロードの為に xapi を問い合わせしています"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, 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:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "ドメイン0 上の /boot/guest に VDI %s をコピー中"
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "カーネル/RAMディスク VDI %s が削除されました"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "PV kernelのvdi %s を取得します。"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s は依然として存在しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "SR %s を再スキャンします。"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "VBD %s を接続しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "仮想ブロックデバイス(VBD) %s の接続が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)を削除しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)の削除が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "%s に対して pygrub を実行しています"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Xen Kernel %s が見つかりました。"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 "No Xen kernel found.  Booting HVM.\r\n"
 "Xen 用カーネルが見つかりません。完全仮想化モード(HVM)で起動しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "パーティションテーブル %s の書き込みが完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8148,185 +8162,185 @@ msgstr ""
 msgid "Starting instance"
 msgstr "raw instanceを生成します。"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 #, fuzzy
 msgid "Starting VM"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "VM %s のスナップショットとアップロードが完了しました。"
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr "カーネル/RAMディスクファイルが削除されました"
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 #, fuzzy
 msgid "Destroying VM"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8358,7 +8372,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "%(sr_ref)s として %(label)s を導入しました"
@@ -8371,7 +8385,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8433,12 +8447,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "マウントポイントを変換できません。 %s"
@@ -8487,47 +8506,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s 用のSR %(sr_ref)s における VDI を作成できません"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s 用のSR %(sr_ref)s が使用できません"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s にマウントポイント %(mountpoint)s を接続(attach)しました"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "ボリューム %s を切断(detach)できません"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s からマウントポイント %(mountpoint)s を切断(detach)しました"
@@ -9089,52 +9108,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9908,3 +9927,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "バックエンドは %s です。"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr "Request context を空とすることは非推奨です。"
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index ac4ab0a8d..458418232 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -189,158 +189,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -348,132 +352,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -481,734 +485,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1350,138 +1354,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1893,14 +1885,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1928,7 +1920,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2191,222 +2183,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2414,19 +2401,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2918,7 +2905,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2971,184 +2958,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3157,492 +3144,500 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "인스턴스가 이미 생성되었습니다"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3869,54 +3864,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4211,7 +4202,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4219,39 +4234,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4259,89 +4274,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4419,26 +4434,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5063,19 +5071,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5158,12 +5166,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5180,17 +5188,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5214,59 +5222,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5379,7 +5387,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5406,16 +5414,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5611,7 +5619,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5626,7 +5634,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6170,7 +6178,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6195,7 +6203,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
@@ -6230,7 +6238,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6348,219 +6356,219 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6570,51 +6578,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6655,127 +6663,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6804,31 +6812,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6848,19 +6856,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7431,150 +7439,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7676,423 +7700,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8102,181 +8114,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8308,7 +8320,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8321,7 +8333,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8383,12 +8395,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8437,47 +8454,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스의 %(sr_ref)s SR에 대한 VDI 생성이 실패했습니다"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스의 %(sr_ref)s SR을 사용 할 수 없습니다"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 장착되었습니다"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 탈착되었습니다"
@@ -9038,52 +9055,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9857,3 +9874,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index e6da3a1f4..70e4b5cf9 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -166,7 +166,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -190,158 +190,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Ugyldig IP protokoll %(protocol)s."
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, 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:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,132 +353,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr "Ressurs ble ikke funnet."
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr ""
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -482,734 +486,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Nettverk %(network_id)s ble ikke funnet."
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Ingen nettverk definert."
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr "Handlingen er ikke tillatt."
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr "Kvote overskredet"
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1351,138 +1355,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Resultat var %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r feilet. Prøver på nytt."
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr "Stoppet WSGI tjener."
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr "WSGI tjener har stoppet."
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr "Du må implementere __call__"
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1894,14 +1886,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1929,7 +1921,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2192,222 +2184,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr "Tjener eksisterer ikke"
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr "Metadata element ble ikke funnet"
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr "Ugyldig tjener-status: %(status)s"
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr "Tjenernavn er ikke en streng eller unicode"
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr "Tjenernavn er en tom streng"
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Feil nettverks-format: mangler %s"
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr "Feil nettverks-format"
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr "Tjenernavn er ikke definert"
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2415,19 +2402,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2918,7 +2905,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2971,184 +2958,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3157,487 +3144,495 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3864,54 +3859,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4206,7 +4197,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4214,39 +4229,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4254,89 +4269,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4414,26 +4429,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5058,19 +5066,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5153,12 +5161,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5175,17 +5183,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5209,59 +5217,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5374,7 +5382,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5401,16 +5409,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5606,7 +5614,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5621,7 +5629,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6159,7 +6167,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6184,7 +6192,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
@@ -6219,7 +6227,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6337,219 +6345,219 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6559,51 +6567,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6644,127 +6652,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6793,31 +6801,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6837,19 +6845,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7419,150 +7427,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7664,423 +7688,412 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+#, fuzzy, python-format
+msgid "SR not present and could not be introduced"
+msgstr "Prosjekt %(project_id)s ble ikke funnet."
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8089,181 +8102,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8295,7 +8308,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8308,7 +8321,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8370,12 +8383,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8424,47 +8442,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9022,52 +9040,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9836,3 +9854,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr "Ugyldig tjener-status: %(status)s"
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 4cb8ed7d2..9939efd9d 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nova 2013.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -184,158 +184,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,132 +347,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr ""
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -476,734 +480,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1345,138 +1349,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1888,14 +1880,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1923,7 +1915,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2186,222 +2178,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2409,19 +2396,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2912,7 +2899,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2965,184 +2952,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3151,487 +3138,495 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3858,54 +3853,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4200,7 +4191,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4208,39 +4223,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4248,89 +4263,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4408,26 +4423,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:173
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
-msgstr ""
-
-#: nova/openstack/common/policy.py:179
-#, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5052,19 +5060,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5147,12 +5155,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5169,17 +5177,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5203,59 +5211,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5368,7 +5376,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5395,16 +5403,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5600,7 +5608,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5615,7 +5623,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6153,7 +6161,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6178,7 +6186,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
@@ -6213,7 +6221,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6331,219 +6339,219 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6553,51 +6561,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6638,127 +6646,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6787,31 +6795,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6831,19 +6839,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7413,150 +7421,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7658,423 +7682,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8083,181 +8095,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8289,7 +8301,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8302,7 +8314,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8364,12 +8376,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8418,47 +8435,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9016,52 +9033,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 4a0472185..a9c63b98f 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -189,159 +189,164 @@ msgstr "Tipo de volume é inválido"
 msgid "Invalid volume"
 msgstr "Volume inválido"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+#, fuzzy, python-format
+msgid "Invalid metadata size"
+msgstr "Assinatura inválida para usuário %s"
+
+#: nova/exception.py:271
 #, 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:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP %(protocol)s é inválido."
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Tipo de conteúdo %(content_type)s é inválido."
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, 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:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr "Serviço está indisponível neste momento"
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, 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:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -349,133 +354,133 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato do disco %(disk_format)s não é aceito"
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "Instância não existe"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -483,735 +488,735 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s é necessário para criar a rede."
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Nenhuma rede definida."
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, fuzzy, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, 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:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, 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:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Removendo rede com id %s"
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s não encontrada."
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Certificado %(certificate_id)s não encontrado."
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, 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:739
+#: nova/exception.py:743
 #, 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:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, 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:797
+#: nova/exception.py:801
 #, 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:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, 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:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, 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:1147
+#: nova/exception.py:1151
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
@@ -1353,138 +1358,126 @@ msgstr "servidor de modelo perdido"
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Executando comando (subprocesso): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Resultado foi %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r falhou. Tentando novamente."
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Executando o comando (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr "Ambiente não suportado por SSH"
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "depuração em retorno de chamada: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Endereço para Link Local não encontrado: %s"
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, 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:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend inválido: %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "backend %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1899,14 +1892,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1934,7 +1927,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2198,224 +2191,219 @@ msgstr "Este pedido estava com taxa limitada."
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Ponto de montagem não pode ser traduzido: %s"
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2423,19 +2411,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2934,7 +2922,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Executando VPN para %s"
@@ -2987,189 +2975,189 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3178,498 +3166,507 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Não foi possível carregar o driver de virtualização: %s"
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "Começando a terminar instâncias"
+
+#: nova/compute/manager.py:549
 #, fuzzy, python-format
 msgid "Build error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "A instância já foi criada"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instância %s não encontrada"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3896,55 +3893,51 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "backend %s"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, fuzzy, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr "Imagem não encontrada."
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4239,7 +4232,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "Volume não encontrada para a instância %(instance_id)s."
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, fuzzy, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr "Volume não encontrada para a instância %(instance_id)s."
+
+#: nova/network/manager.py:685
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr "Volume não encontrada para a instância %(instance_id)s."
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4247,39 +4264,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4287,89 +4304,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr "Rede já existe!"
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4447,26 +4464,19 @@ msgstr "Removendo rede com id %s"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5094,19 +5104,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5189,12 +5199,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5211,17 +5221,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5245,59 +5255,59 @@ msgstr "_obter: %s"
 msgid "_get_all: %s"
 msgstr "_obter_todos: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5410,7 +5420,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5438,16 +5448,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5643,7 +5653,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5658,7 +5668,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6205,7 +6215,7 @@ msgstr "Apagando usuário %s"
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6230,7 +6240,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Desanexar volume %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Não é possível anexar o volume na instância %s"
@@ -6265,7 +6275,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6383,222 +6393,222 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6608,51 +6618,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Falha de Autenticação: %s"
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6693,127 +6703,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6842,31 +6852,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "_criar: %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Iniciando a Bridge para %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "_criar: %s"
@@ -6886,19 +6896,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7472,150 +7482,166 @@ msgstr "Obtendo o tamanho da imagem para a imagem %s"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Atualizando agente para %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr "Falhou em atualizar senha: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, fuzzy, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "Falhou em atualizar senha: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erro de OpenSSL: %s"
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "Aumento não implementado"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, 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:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Chamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7719,69 +7745,69 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 #, fuzzy
 msgid "Created VM"
 msgstr "_criar: %s"
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "O VBD não foi encontrado na instância %s"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "group %s já existe"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Não é possível desconectar o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -7790,360 +7816,349 @@ msgstr ""
 "VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) no SR "
 "%(sr_ref)s criada com sucesso."
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+#, fuzzy, python-format
+msgid "SR not present and could not be introduced"
+msgstr "Projeto %(project_id)s não foi encontrado."
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, 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:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk %s destruidos"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Verificando o vdi %s para kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "O VDI %s continua disponível"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Conectando VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "O VDB %s foi conectado."
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruindo VBD para o VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, 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:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Rodando pygrub novamente %s"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen encontrado: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen não encontrado. Iniciando como HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Atualizando agente para %s"
@@ -8153,182 +8168,182 @@ msgstr "Atualizando agente para %s"
 msgid "Starting instance"
 msgstr "Iniciando instância %s"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Falha ao suspender instância"
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, fuzzy, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8360,7 +8375,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8373,7 +8388,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8435,12 +8450,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:309
+#, python-format
+msgid "Unable to obtain target information %(connection_data)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Ponto de montagem não pode ser traduzido: %s"
@@ -8489,49 +8509,49 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "Não é possível criar o VDI no SR %(sr_ref)s para a instância "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Não é possível usar o SR %(sr_ref)s para a instância %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s conectada à instância %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Não é possível desconectar o volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s desanexada da instância %(instance_name)s"
@@ -9094,52 +9114,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9913,3 +9933,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "backend %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 48b1d771d..1fedfa988 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -170,7 +170,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "Том %(volume_id)s никуда не присоединён"
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -194,57 +194,62 @@ msgstr "Недопустимый тип тома"
 msgid "Invalid volume"
 msgstr "Недопустимый том"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "Недопустимые метаданные"
 
 #: nova/exception.py:267
+#, fuzzy
+msgid "Invalid metadata size"
+msgstr "Неправильный ключ метаданных"
+
+#: nova/exception.py:271
 #, 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:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Недопустимый протокол IP %(protocol)s."
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Недопустимый тип содержимого %(content_type)s."
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Недопустимый cidr %(cidr)s."
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -253,64 +258,64 @@ msgstr ""
 "Копия %(instance_uuid)s в %(attr)s %(state)s. Невозможно %(method)s во "
 "время нахождения копии в этом состоянии."
 
-#: nova/exception.py:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Копия %(instance_id)s не выполняется."
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Копия %(instance_id)s не переведена в режим приостановления."
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr "Ошибка приостановления копии"
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr "Ошибка возобновления работы сервера"
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr "В данный момент служба недоступна."
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr "Служба Compute недоступна в настоящее время."
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "Невозможно переместить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Копии необходима новая версия гипервизора, вместо предоставленной."
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -319,38 +324,38 @@ msgstr ""
 "Предоставленный адрес диска (%(path)s) уже существует, но ожидалось, что "
 "отсутствует."
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr "Недопустимые сведения ЦПУ"
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s не является допустимым IP-адресом в4/6."
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -358,76 +363,76 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Форматирование диска %(disk_format)s недопустимо"
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Образ %(image_id)s недопустим: %(reason)s"
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Копия %(instance_id)s недопустима: %(reason)s"
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s недопустим."
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "копия - %s не представлена"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr "Ресурс не может быть найден."
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "Том %(volume_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Тип тома %(volume_type_id)s не может быть найден."
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Тип тома под названием %(volume_type_name)s не может быть найден."
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -436,57 +441,57 @@ msgstr ""
 "Тип тома %(volume_type_id)s не имеет дополнительных особенностей с ключом"
 " %(extra_specs_key)s."
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "удаление тома %(volume_name)s, который имеет снимок"
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "Попытка удаления несуществующей консоли %(console_id)s."
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, fuzzy, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr "Попытка удаления несуществующей консоли %(console_id)s."
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Отсутствует диск в %(location)s"
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Невозможно найти обработчик для тома %(driver_type)s."
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Недопустимый образ href %(image_href)s."
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -494,55 +499,55 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "Невозможно найти SR для чтения/записи VDI."
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s необходимо для создания сети."
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Сеть не может быть найдена для моста %(bridge)s"
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Сеть не может быть найдена для uuid %(uuid)s"
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Сеть не найдена с cidr %(cidr)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Сеть не найдена для копии %(instance_id)s."
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "Сети не определены."
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -551,238 +556,238 @@ msgstr ""
 "Или uuid %(network_uuid)s сети не предоставлено или не присвоено проекту "
 "%(project_id)s."
 
-#: nova/exception.py:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "Узел не назначен сети (%(network_id)s)."
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, fuzzy, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, 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:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Недопустимый фиксированный IP-адрес %(address)s."
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Тип тома %(name)s уже существует."
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "Запись DNS %(name)s уже существует в домене %(domain)s."
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "установка сетевого узла"
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Интерфейс %(interface)s не найден."
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Сертификат %(certificate_id)s не найден."
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Узел %(host)s не найден."
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Узел сompute %(host)s не найден."
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr "Квота не найдена"
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Пользователь %(user_id)s не найден."
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Расширенный ресурс: %s"
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Группа безопасности %(security_group_id)s не найдена."
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, 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:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -791,7 +796,7 @@ msgstr ""
 "Группа безопасности %(security_group_id)s уже ассоциирована с копией "
 "%(instance_id)s"
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -800,446 +805,446 @@ msgstr ""
 "Группа безопасности %(security_group_id)s не ассоциирована с копией "
 "%(instance_id)s"
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Перемещение %(migration_id)s не найдено."
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Перемещение не найдено для копии %(instance_id)s в состоянии %(status)s."
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Пул консоли %(pool_id)s не найден."
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Консоль %(console_id)s не найдена."
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Консоль для копии %(instance_id)s не найдена."
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, 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:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Недопустимый тип консоли %(console_type)s "
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Тип копии с названием %(instance_type_name)s не найден."
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, 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:842
+#: nova/exception.py:846
 #, 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:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Файл %(file_path)s не может быть найден."
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "Не найден виртуальный переключатель ассоциированный с сетевым адаптером "
 "%(adapter)s."
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Сетевой адаптер %(adapter)s не может быть найден."
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr "Действие не разрешено."
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Копия %(name)s уже существует."
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "Тип тома %(name)s уже существует."
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr "Ошибка перемещения"
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Неправильное тело сообщения: %(reason)s"
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "При изменении размера, копии должны изменить размер!"
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr "Образ больше, чем допустимо для этого типа копии"
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Недостаточно памяти на узле сети compute для запуска %(uuid)s."
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Узел %(host)s не работает или не существует."
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr "Превышена квота"
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, fuzzy, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Выбрано макс. количество узлов (%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 "Невозможно создать volume_type с именем %(name)s и спецификациями "
 "%(extra_specs)s"
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "Обнаружено неизвестное исключение."
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Копия %(instance_id)s не найдена."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Проект %(project_id)s не найден."
@@ -1383,138 +1388,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Приняты неизвестные аргументы ключевого слова для utils.execute: %r"
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Выполнение команды (субпроцесс): %s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "Результат %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r ошибка. Выполняется повтор."
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Выполнение команды (SSH): %s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr "Среда не поддерживается с использованием SSH"
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr "process_input не поддерживается с использованием SSH"
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "отладка в обратном вызове: %s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Недопустимый внутренний интерфейс: %s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "внутренний интерфейс %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Ожидался объект типа: %s"
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Недопустимая server_string: %s"
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' заняла %(total_time).2f с."
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удаления контейнера: %s"
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, fuzzy, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr "Выполняется %(name)s на %(host)s:%(port)s"
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr "Выполняется останов сервера WSGI."
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr "Сервер WSGI был остановлен."
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1939,7 +1932,7 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr "Расширенный ресурс: %s"
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
@@ -1948,7 +1941,7 @@ msgstr ""
 "Расширение %(ext_name)s: Невозможно расширить ресурс %(collection)s: Нет "
 "такого ресурса"
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Расширение %(ext_name)s расширение ресурса: %(collection)s"
@@ -1976,7 +1969,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr "маркер [%s] не найден"
@@ -2243,226 +2236,221 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr "Сервер не существует"
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr "Элемент метаданных не найден"
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr "Копия не найдена"
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr "Недопустимое состояние сервера: %(status)s"
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "Выполнение запуска копий"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr "Имя сервера является пустой строкой"
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 #, fuzzy
 msgid "Unknown argment : port"
 msgstr "Неизвестная цепочка: %r"
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, fuzzy, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr "Недопустимый сетевой формат: сетевой uuid имеет неправильный формат (%s)"
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "Недопустимый сетевой формат: сетевой uuid имеет неправильный формат (%s)"
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "Недопустимый фиксированный IP-адрес (%s)"
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Дубликаты сетей (%s) не разрешены"
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Недопустимый сетевой формат: отсутствует %s"
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr "Недопустимый сетевой формат"
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr "Содержимое данных пользователя не может быть дешифровано"
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr "Имя сервера не задано"
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr "Предоставлен недопустимый flavorRef."
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr "Невозможно найти запрошенный образ"
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr "Предоставлен недопустимый key_name."
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "Точка подключения не может быть переведена: %s"
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr "С копией не производилось изменение размера."
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr "Отсутствует аргумент типа 'type' для перезагрузки"
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr "Ошибка при перезагрузке %s"
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "Изменение размера требует изменения объёма."
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr "Отсутствует атрибут imageRef"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr "Отсутствует атрибут flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr "adminPass не был задан"
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr "Недопустимый adminPass"
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Запрос изменения размера имеет недопустимый атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Запросы изменение размера требуют атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2470,19 +2458,19 @@ msgstr "Запросы изменение размера требуют атри
 msgid "Invalid request body"
 msgstr "Недопустимый запрос тела"
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
@@ -2985,7 +2973,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Запуск VPN для %s"
@@ -3043,72 +3031,72 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполняет запуск %s копий..."
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 #, fuzzy
 msgid "No host for instance, deleting immediately"
 msgstr "Отсутствует узел для копии %s, немедленное удаление"
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 #, fuzzy
 msgid "host for instance is down, deleting from database"
 msgstr "Отсутствует узел для копии %s, немедленное удаление"
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Попытка остановить %s"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Попытка запустить %s"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "Поиск по: %s"
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "Тип образа не распознан %s"
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Запуск снимка для ВМ %s"
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -3117,47 +3105,47 @@ msgstr ""
 "Устаревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Группа безопасности %s не может быть пустой."
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -3166,73 +3154,73 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Длина превышает "
 "максимально допустимое значение 255."
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопасности %s"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Группа безопасности %s уже существует"
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Группа безопасности (%s) не найдена"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Правило (%s) не найдено"
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "Копия типа %s не найдена для выполнения удаления"
@@ -3241,78 +3229,87 @@ msgstr "Копия типа %s не найдена для выполнения �
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Невозможно загрузить драйвер виртуализации: %s"
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "Выполнение запуска копий"
+
+#: nova/compute/manager.py:549
 #, fuzzy, python-format
 msgid "Build error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "Копия уже была создана"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3321,7 +3318,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3330,73 +3327,73 @@ msgstr ""
 "Образ '%(image_id)s' размером %(size_bytes)d, превышает exceeded "
 "instance_type допустимый размер %(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Установка состояния копии vm_state на ERROR"
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3405,17 +3402,17 @@ msgstr ""
 "попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
 "%(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "копия %s: выполнение снимка"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3424,192 +3421,192 @@ msgstr ""
 "попытка создания снимка не выполняемой копии: %(instance_uuid)s "
 "(состояние: %(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Найдено %(num_images)d образов (ротация: %(rotation)d)"
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 #, fuzzy
 msgid "Root password set"
 msgstr "Копия %s: Назначение административного пароля"
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Ошибка назначения пароля администратора"
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr "назначение совпадает с источником!"
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "копия %s: принятие диагностики"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "Восстановление сети"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 #, fuzzy
 msgid "Inject network info"
 msgstr "установка сетевого узла"
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "копия %s: получение консоли vnc"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Отсоединение тома от неизвестной копии %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3618,16 +3615,16 @@ msgstr ""
 "отсутствует домен с соответствующим именем.\" Эта ошибка может быть "
 "безопасно пропущена."
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2397
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -3636,59 +3633,59 @@ msgstr ""
 "Найдены %(migration_count)d неподтверждённых перемещений, старше "
 "%(confirm_window)d секунд"
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr "Обновление временных данных использования полосы пропускания"
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr "Обновление состояния узла"
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3697,62 +3694,62 @@ msgstr ""
 "Найдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
 "гипервизоре."
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "копия не включена"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, пропуск..."
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3981,55 +3978,51 @@ msgstr "Полученный токен: %(token)s, %(token_dict)s)"
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "Проверка токена: %(token)s, %(token_valid)s)"
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Нераспознанное значение read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "внутренний интерфейс %s"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, fuzzy, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr "Сервер не найден."
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4331,7 +4324,31 @@ msgstr "Превышена квота для %s, попытка выделени
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "Не найден том для копии %(instance_id)s."
+
+#: nova/network/manager.py:656
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr "Присвоить адрес %(public_ip)s копии %(instance_id)s"
+
+#: nova/network/manager.py:677
+#, fuzzy, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
+
+#: nova/network/manager.py:685
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr "Присвоить адрес %(public_ip)s копии %(instance_id)s"
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4339,41 +4356,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение зоны на |%(av_zone)s|."
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение проекта на |%(project)s|."
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr "установка сетевого узла"
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 #, fuzzy
 msgid "network allocations"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4384,69 +4401,69 @@ msgstr ""
 "доступной зоне |%(zone)s|. Копия |%(instance)s| расположена в зоне "
 "|%(zone2)s|. Запись DNS не будет создана."
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Арендованный IP |%(address)s|"
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Присвоенный IP |%(address)s|"
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr "cidr уже используется"
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей супер-сетью "
 "(%(super)s)"
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -4455,22 +4472,22 @@ msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей, меньшей cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr "Сеть уже существует!"
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Сеть должна быть исключена из проекта %s перед удалением"
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4550,28 +4567,21 @@ msgstr "установка сетевого узла"
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
-#, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
-msgstr ""
-
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid "Failed to understand rule %(match)r"
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
-msgstr ""
-
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:404
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
+#: nova/openstack/common/policy.py:679
+#, fuzzy, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr "Ошибка обновления агента: %(resp)r"
+
 #: nova/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -5208,19 +5218,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5303,12 +5313,12 @@ msgstr "Заданные данные: %s"
 msgid "Result data: %s"
 msgstr "Итоговые данные: %s"
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Создание файлов в %s для имитации гостевого агента"
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Удаление файлов имитации гостевого агента в %s"
@@ -5325,18 +5335,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5360,59 +5370,59 @@ msgstr "_get: %s"
 msgid "_get_all: %s"
 msgstr "_get_all: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr "test_snapshot_create: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr "test_snapshot_create: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr "test_snapshot_create_force: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr "test_snapshot_create_force: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr "test_snapshot_show: resp=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr "test_snapshot_detail: resp_dict=%s"
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr "Выполняемые копии: %s"
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "После завершения работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "После принудительного завершения работы копий: %s"
@@ -5528,7 +5538,7 @@ msgstr "Непредвиденный код состояния"
 msgid "Decoding JSON: %s"
 msgstr "Декодирование JSON: %s"
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5556,16 +5566,16 @@ msgstr "Добавление правила группы безопасност�
 msgid "Adding provider rule: %s"
 msgstr "Добавление правила поставщика: %s"
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr "Ошибка анализа 'qemu-img info'."
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "Преобразование в необработанный, но текущий формат %s"
@@ -5761,7 +5771,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5778,7 +5788,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6328,7 +6338,7 @@ msgstr "Создание SR %s"
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "block_device_list %s"
@@ -6353,7 +6363,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Отсоединить том %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Невозможно присоединить том для копии %s"
@@ -6388,7 +6398,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "Ошибка удаления контейнера: %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6506,189 +6516,189 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr "Неполадка с подключением к libvirt"
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "снимок %s: создание завершено"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Пользователь не имеет административных привилегий"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:1267
+#: nova/virt/libvirt/driver.py:1275
 msgid "Creating image"
 msgstr "Создание изображения"
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1411
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -6697,33 +6707,33 @@ msgstr ""
 "Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "устаревшая версия libvirt (не поддерживается getVersion)"
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6733,7 +6743,7 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -6742,45 +6752,45 @@ msgstr ""
 "Создание временного файла %s для оповещения других узлов сети compute о "
 "необходимости присоединения того же хранилища."
 
-#: nova/virt/libvirt/driver.py:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "Ошибка аутентификации: %s"
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr "plug_vifs() ошибка %(cnt)d.До %(max_retry)d попыток для %(hostname)s."
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Копия %s: выполнение"
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6823,127 +6833,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr "неизвестный обработчик образа диска: %s"
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6972,31 +6982,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "_создать: %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "Запуск моста интерфейса для %s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "_создать: %s"
@@ -7017,12 +7027,12 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr "Ошибка отсоединения vif копии '%s'"
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "iSCSI-устройство не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
@@ -7031,7 +7041,7 @@ msgstr ""
 "Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторная "
 "проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr "Найден узел iSCSI %(mount_device)s (после %(tries)s повторных проверок)"
@@ -7626,14 +7636,14 @@ msgstr "Получение размера образа для образа %s"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Принят размер образа %(size)s для образа %(image)s"
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, 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:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -7642,12 +7652,12 @@ msgstr ""
 "НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
 "id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, 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:92
+#: nova/virt/xenapi/agent.py:99
 #, fuzzy, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
@@ -7656,68 +7666,84 @@ msgstr ""
 "Вызов агентом %(method)s возвратил недопустимый ответ: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr "Ошибка запроса версии агента: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr "Запрос версии агента"
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Обновление агента до %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr "Ошибка обновления агента: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr "Настройка пароля администратора"
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr "Ошибка обмена ключей: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr "Ошибка обновления пароля: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr "Восстановление сети"
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, fuzzy, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "Ошибка обновления пароля: %(resp)r"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr "Средства XenServer не установлены в этот образ"
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Ошибка OpenSSL: %s"
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 #, fuzzy
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
@@ -7728,60 +7754,60 @@ msgstr ""
 "(необязательно) и xenapi_connection_password для использования "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/driver.py:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr "Запуск узла на XenServer не поддерживается."
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 "Невозможно выполнить вход в XenAPI (недостаточно свободного места на "
 "Dom0?)"
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr "Исключение: %s"
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake не имеет реализации для %s"
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Выполняется вызов %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "Выполняется вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Выполняется вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7886,69 +7912,69 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 #, fuzzy
 msgid "Created VM"
 msgstr "_создать: %s"
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD не найдено для копии %s"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "группа %s уже существует"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Невозможно отсоединить VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Невозможно ликвидировать VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Невозможно ликвидировать VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -7957,83 +7983,88 @@ msgstr ""
 "Создан VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "на %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+#, fuzzy
+msgid "SR not present and could not be introduced"
+msgstr "Копия не найдена"
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Отсутствует первичный VDI для%(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "Запуск снимка для ВМ %s"
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Запрос xapi для выгрузки %(vdi_uuids)s в качестве ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 "xapi 'download_vhd' возвратил VDI типа '%(vdi_type)s' с UUID "
 "'%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "Запрос xapi на приём образа vhd %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, 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:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
@@ -8042,17 +8073,17 @@ msgstr ""
 "Размер образа %(size_bytes)d превышает допустимый instance_type  размер "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "Ядро не найдено для образа %(image_id)s."
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -8061,206 +8092,206 @@ msgstr ""
 "Превышен размер ядра/Ramdisk образа: %(vdi_size)d байт, макс. "
 "%(max_size)d байт"
 
-#: nova/virt/xenapi/vm_utils.py:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Копирование VDI %s в /boot/guest на dom0"
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Ядро/Ramdisk VDI %s ликвидирован"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, 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:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Поиск vdi %s для ядра PV"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "Неизвестный формат образа %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s до сих пор доступен"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Повторная проверка SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr "Невозможно найти SR типа содержимого ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO: поиск SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr "ISO: не содержимое iso типа"
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR с локальной PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Время ожидания при создании устройства %s"
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Подсоединение VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Подсоединение VBD %s выполнено."
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, 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:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, 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:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ликвидирование VBD для VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ликвидирование VBD для VDI %s завершено."
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Найдено ядро Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Ядро Xen не найдено.  Загрузка HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr "Разделы:"
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d секторов"
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -8269,57 +8300,41 @@ msgstr ""
 "Запись таблицы разделов %(primary_first)d %(primary_last)d в "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Запись таблицы разделов %s выполнена."
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr "Средства XenServer не установлены в этот образ"
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 "Ошибка присоединения файловой системы (ожидаемо для копий не на базе "
 "linux): %s"
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
@@ -8329,197 +8344,197 @@ msgstr "Обновление выполнения копии '%(instance_uuid)s'
 msgid "Starting instance"
 msgstr "Запуск копии %s"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Удаление ядра/ramdisk файлов из dom0"
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Ошибка обновления тома в базе данных"
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 "Автоматическая настройка диска для копии %(instance_uuid)s, выполняется "
 "попытка изменения размера раздела..."
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 #, fuzzy
 msgid "Starting VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Версия агента копии: %s"
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "Готовый снимок и выгрузка для ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr "Ошибка перемещения vhd на новый узел"
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, fuzzy, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Изменение размера VDI %(cow_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Изменение размера VDI %(vdi_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 #, fuzzy
 msgid "Resize complete"
 msgstr "Изменение размера копии %s завершено"
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "Ошибка поиска vbd для vdi %s"
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, fuzzy, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 "Копия %(instance_uuid)s использует RAW или VHD, пропуск ядра и удаление "
 "ramdisk"
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "копия содержит ядро или ramdisk, но не оба"
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr "файлы ядра/ramdisk удалены"
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "Копия в состоянии режима восстановления: %s"
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 #, fuzzy
 msgid "VM is not present, skipping power off..."
 msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "Автоматическая безотказная перезагрузка %d"
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "установка сетевого узла"
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Создание изображения"
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "Ошибка создания"
@@ -8552,7 +8567,7 @@ msgid "introducing sr within volume_utils"
 msgstr "внедрение sr в volume_utils"
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "внедрён %(label)s в качестве %(sr_ref)s."
@@ -8565,7 +8580,7 @@ msgstr "Создание pbd для SR"
 msgid "Plugging SR"
 msgstr "Подключение SR"
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr "Невозможно внедрить Репозиторий хранения"
 
@@ -8627,12 +8642,17 @@ msgstr "Ошибка поиска vdis в SR %s"
 msgid "Unable to find vbd for vdi %s"
 msgstr "Ошибка поиска vbd для vdi %s"
 
-#: nova/virt/xenapi/volume_utils.py:304
-#, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volume_utils.py:281
+#, fuzzy, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
 msgstr "Невозможно получить сведения назначения %(data)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:309
+#, fuzzy, python-format
+msgid "Unable to obtain target information %(connection_data)s"
+msgstr "Невозможно получить сведения назначения %(data)s, %(mountpoint)s"
+
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Точка подключения не может быть переведена: %s"
@@ -8681,47 +8701,47 @@ msgstr "SR %s не найден в базе данных xapi"
 msgid "Could not forget SR"
 msgstr "Невозможно забыть SR"
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Невозможно создать VDI на SR %(sr_ref)s для копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Невозможно использовать SR %(sr_ref)s для копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Точка подключения %(mountpoint)s присоединена к копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Невозможно найти том %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Невозможно отсоединить том %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr "Невозможно ликвидировать vbd %s"
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr "Ошибка очистки SR %s"
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Точка подключения %(mountpoint)s отсоединена от копии %(instance_name)s"
@@ -9292,42 +9312,42 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr "Задайте san_password или san_private_key"
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr "san_ip должен быть назначен"
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "LUID не найден для %(zfs_poolname)s. Вывод=%(out)s"
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr "Возврат команды CLIQ %s"
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 "Неправильный ответ на команду CLIQ %(verb)s %(cliq_args)s. "
 "Результат=%(out)s"
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr "Ошибка выполнения команды CLIQ %(verb)s %(cliq_args)s.  Результат=%(out)s"
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
@@ -9336,12 +9356,12 @@ msgstr ""
 "Непредвиденное количество виртуальных ip для кластера  %(cluster_name)s. "
 "Результат=%(_xml)s"
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr "Сведения о томе: %(volume_name)s => %(volume_attributes)s"
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr "local_path не поддерживается"
 
@@ -10116,3 +10136,33 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "внутренний интерфейс %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr "Недопустимое состояние сервера: %(status)s"
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index ecce45f97..103ae25a8 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -184,158 +184,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,132 +347,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr ""
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -476,734 +480,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1345,138 +1349,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1888,14 +1880,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1923,7 +1915,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2186,222 +2178,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2409,19 +2396,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2912,7 +2899,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2965,184 +2952,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3151,487 +3138,495 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3858,54 +3853,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4200,7 +4191,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4208,39 +4223,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4248,89 +4263,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4408,26 +4423,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5052,19 +5060,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5147,12 +5155,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5169,17 +5177,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5203,59 +5211,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5368,7 +5376,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5395,16 +5403,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5600,7 +5608,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5615,7 +5623,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6153,7 +6161,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6178,7 +6186,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
@@ -6213,7 +6221,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6331,219 +6339,219 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6553,51 +6561,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6638,127 +6646,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6787,31 +6795,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "natanggap %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6831,19 +6839,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7413,150 +7421,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7658,423 +7682,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8083,181 +8095,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8289,7 +8301,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8302,7 +8314,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8364,12 +8376,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8418,47 +8435,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9017,52 +9034,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9831,3 +9848,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 440f298b3..1e2aaf1e6 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -160,7 +160,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -184,158 +184,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,132 +347,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr ""
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -476,734 +480,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1345,138 +1349,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1888,14 +1880,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1923,7 +1915,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2186,222 +2178,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2409,19 +2396,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2912,7 +2899,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2965,184 +2952,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3151,487 +3138,495 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3858,54 +3853,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4200,7 +4191,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4208,39 +4223,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4248,89 +4263,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4408,26 +4423,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5052,19 +5060,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5147,12 +5155,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5169,17 +5177,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5203,59 +5211,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5368,7 +5376,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5395,16 +5403,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5600,7 +5608,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5615,7 +5623,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6153,7 +6161,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6178,7 +6186,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
@@ -6213,7 +6221,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6331,219 +6339,219 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6553,51 +6561,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6638,127 +6646,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6787,31 +6795,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6831,19 +6839,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7413,150 +7421,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7658,423 +7682,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8083,181 +8095,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8289,7 +8301,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8302,7 +8314,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8364,12 +8376,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8418,47 +8435,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9016,52 +9033,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9830,3 +9847,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 0425d7181..a6515777a 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -161,7 +161,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -185,158 +185,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -344,132 +348,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr ""
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -477,734 +481,734 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 msgid "Unknown NFS exception"
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1346,138 +1350,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1890,14 +1882,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1925,7 +1917,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2188,222 +2180,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2411,19 +2398,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2914,7 +2901,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2967,184 +2954,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3153,487 +3140,495 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3860,54 +3855,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4202,7 +4193,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4210,39 +4225,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4250,89 +4265,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4410,26 +4425,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5054,19 +5062,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5149,12 +5157,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5171,17 +5179,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5205,59 +5213,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5370,7 +5378,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5397,16 +5405,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5602,7 +5610,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5617,7 +5625,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6155,7 +6163,7 @@ msgstr "Від'єднати том %s"
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6180,7 +6188,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "Від'єднати том %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
@@ -6215,7 +6223,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6333,219 +6341,219 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6555,51 +6563,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6640,127 +6648,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6789,31 +6797,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "отримано %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6833,19 +6841,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7415,150 +7423,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Оголошення черги %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7660,423 +7684,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, fuzzy, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8085,181 +8097,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8291,7 +8303,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8304,7 +8316,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8366,12 +8378,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8420,47 +8437,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -9019,52 +9036,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9833,3 +9850,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index cec840cc3..e65a37371 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr "卷 %(volume_id)s 没有附加任何东西"
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr "密钥对数据无效"
 
@@ -189,159 +189,164 @@ msgstr "无效的卷类型"
 msgid "Invalid volume"
 msgstr "无效的卷"
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr "无效的元数据"
 
 #: nova/exception.py:267
+#, fuzzy
+msgid "Invalid metadata size"
+msgstr "无效的元数据键"
+
+#: nova/exception.py:271
 #, 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:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "无效的IP协议 %(protocol)s。"
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "无效的内容类型 %(content_type)s。"
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "无效的cidr %(cidr)s。"
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, 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:299
+#: nova/exception.py:303
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "实例 %(instance_id)s 没有运行。"
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "实例 %(instance_id)s 没有挂起。"
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr "挂起实例失败"
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr "服务器恢复失败"
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr "此时的付不可用。"
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr "此时的计算服务不可用。"
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "无法把实例 (%(instance_id)s) 迁移到当前主机 (%(host)s)。"
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr "提供的虚拟机管理程序类型无效。"
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "该实例需要比当前版本更新的虚拟机管理程序。"
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "提供的磁盘路径 (%(path)s) 已经存在，预计是不存在的。"
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr "无法接受的CPU信息"
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s 不是有效的IP v4/6地址。"
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -351,133 +356,133 @@ msgstr ""
 "包含端口组 %(bridge)s 的vSwitch没有与预计的物理适配器关联。预计的vSwitch是 %(expected)s，但关联的是 "
 "%(actual)s。"
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "磁盘格式 %(disk_format)s 不能接受"
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "实例 %(instance_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s 无法接受。"
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 #, fuzzy
 msgid "Constraint not met."
 msgstr "实例 - %s 不存在"
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr "资源没有找到。"
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, fuzzy, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, fuzzy, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "无法找到帐户 %(account_name) on Solidfire 设备"
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "卷 %(volume_id)s 没有含键 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "卷类型 %(volume_type_id)s 没有找到。"
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "名为 %(volume_type_name)s 的卷类型没有找到。"
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "卷类型 %(volume_type_id)s 没有额外说明键 %(extra_specs_key)s 。"
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "正在删除有快照的卷  %(volume_name)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, fuzzy, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "在 %(location)s 没有磁盘"
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "无法为 %(driver_type)s 卷找到句柄。"
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "无效的镜像href %(image_href)s。"
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -485,740 +490,740 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr "没有找到存储库来读写VDI。"
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "创建网络 %(req)s  是必要的。"
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "无法为桥 %(bridge)s 找到网络"
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "无法为uuid %(uuid)s 找到网络"
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "无法为cidr %(cidr)s 找到网络。"
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr "没有网络定义。"
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "主机没有设置于网络 (%(network_id)s)。"
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "无法找到虚拟机使用的数据存储引用。"
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, fuzzy, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关联。"
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "没有为地址 %(address)s 找到固定IP。"
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "实例 %(instance_id)s 没有固定ip。"
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, 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:596
+#: nova/exception.py:600
 #, 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:600
+#: nova/exception.py:604
 #, 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:605
+#: nova/exception.py:609
 #, 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:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "固定IP地址 %(address)s 无效。"
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr "没有固定ip可用。"
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr "找不到固定IP。"
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "找不到适合id %(id)s 的浮动IP。"
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "DNS 入口 %(name)s 已经在域中 %(domain)s 存在。"
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "找不到适合地址 %(address)s 的浮动ip。"
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "找不到适合地址 %(address)s 的浮动ip。"
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "没有找到floating_ip"
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr "没有浮动IP可用。"
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "浮动ip %(address)s 没有被关联。"
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr "没有浮动ip存在。"
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "接口 %(interface)s没有找到。"
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "证书 %(certificate_id)s 没有找到。"
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "计算主机 %(host)s 没有找到。"
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。"
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr "配额没有找到。"
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "用户 %(user_id)s 没有找到。"
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "扩展资源：%s"
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "安全组 %(security_group_id)s 没有找到。"
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, 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:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, 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:765
+#: nova/exception.py:769
 #, 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:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "迁移 %(migration_id)s 没有找到。"
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "没有为实例 %(instance_id)s 找到迁移其状态为 %(status)s 。"
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "控制台池 %(pool_id)s 没有找到。"
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "控制台%(console_id)s 没有找到。"
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制台。"
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, 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:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "无效的控制台类型 %(console_type)s "
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "名为 %(instance_type_name)s 的实例类型没有找到。"
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "类型 %(flavor_id)s 没有找到。"
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr "调度器的成本函数 %(cost_fn_str)s 没有找到。"
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr "未找到调度器的权重标记：%(flag_name)s"
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, 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:842
+#: nova/exception.py:846
 #, 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:847
+#: nova/exception.py:851
 #, 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:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找不到文件 %(file_path)s。"
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr "没找到文件"
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "未找到与网络适配器 %(adapter)s 关联的虚拟交换机。"
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "未找到网络适配器 %(adapter)s。"
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr "操作不允许。"
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr "快照不允许循环。"
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr "备份 image_type 要求循环参数。"
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "密钥对 %(key_name)s 已经存在。"
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "实例 %(name)s 已经存在。"
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "卷类型 %(name)s 已经存在。"
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr "迁移错误"
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "调整时实例的大小必须要发生变化。"
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr "镜像比实例类型所允许的大。"
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr "实例类型的内存对于所请求的镜像太小。"
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr "实例类型的磁盘对于所请求的镜像太小。"
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "没有足够的可用内存来启动计算节点  %(uuid)s。"
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "无法获取此主机的带宽、CPU和磁盘指标。"
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "主机 %(host)s 没有启动或者不存在。"
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr "超出配额"
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, fuzzy, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr "超过个性化文件限制"
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr "个性化文件路径太长"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr "个性化文件内容太长"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, 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:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "找不到聚合 %(aggregate_id)s。"
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "聚合 %(aggregate_name)s 已经存在。"
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, 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:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, fuzzy, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "检测到不止一个名称为 %(vol_name) 的卷。"
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr "无法创建名称为 %(name)s 规格为 %(extra_specs)s 的卷类型。"
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "发生未知异常。"
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr "无法创建实例类型。"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr "来自SolidFire API的错误响应"
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "SolidFire API响应里发生错误：data=%(data)s"
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "检测到已存在的id为%(vlan) vlan"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "项目 %(project_id)s 没有找到。"
@@ -1360,138 +1365,126 @@ msgstr "失去与模型服务器的连接"
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "发现未知的 utils.execute 关键字参数：%r"
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在运行cmd (subprocess)：%s"
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr "运行结果为 %s"
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失败，重试。"
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "运行cmd (SSH)：%s"
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr "SSH上不支持环境变量"
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr "SSH上不支持的进程输入参数。"
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr "回调中debug：%s"
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地址没有找到：%s"
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的后台：%s"
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr "后台 %s"
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr "循环调用中。"
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得信号量 \"%(lock)s\" 为方法 \"%(method)s\" ...锁"
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在 试图获取锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得文件锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "不正确的server_string：%s"
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, fuzzy, python-format
 msgid "Reloading cached file %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, fuzzy, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr "启动%(name)s 位置在 %(host)s:%(port)s"
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr "关闭WSGI服务器"
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr "WSGI服务器已经停止。"
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr "你必须执行 __call__"
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, fuzzy, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
@@ -1914,14 +1907,14 @@ msgstr "必须明确一个ExtensionManager类"
 msgid "Extended resource: %s"
 msgstr "扩展资源：%s"
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr "扩展%(ext_name)s：无法扩展资源 %(collection)s：没有那种资源"
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "扩展资源的扩展 %(ext_name)s：%(collection)s"
@@ -1949,7 +1942,7 @@ msgstr "offset 参数必须是整数"
 msgid "offset param must be positive"
 msgstr "offset 参数必须是正数"
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr "没有找到标记 [%s]"
@@ -2214,230 +2207,225 @@ msgstr "这个请求受到频率限制。"
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr "服务器不存在"
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr "元数据项目未找到"
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr "无法找到实例"
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr "无效的服务器状态：%(status)s"
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr "无效的changes-since值"
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 #, fuzzy
 msgid "Only administrators may list deleted instances"
 msgstr "准备尝试软删除实例 %s"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr "服务器名称不是字符串或者unicode"
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr "服务器名称是空串"
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 #, fuzzy
 msgid "Server name must be less than 256 characters."
 msgstr "密钥对名称长度必须在1到255个字符之间"
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "错误的个性化格式：丢失 %s"
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr "损坏的个性化格式"
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "个性化 %s 的内容无法解码"
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 #, fuzzy
 msgid "Unknown argment : port"
 msgstr "未知的guestmount错误"
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, fuzzy, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr "损坏的网络格式：网络 uuid 格式不正确 (%s)"
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "损坏的网络格式：网络 uuid 格式不正确 (%s)"
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "不正确的固定 IP 地址(%s)"
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "不允许重复的网络(%s)"
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "错误的网络格式：丢失%s"
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr "错误的网络格式"
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr "Userdata 内容无法解码"
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 不是正确的IPv4格式"
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 #, fuzzy
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr "accessIPv4 不是正确的IPv4格式"
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr "服务器名称未定义"
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr "提供了无效的flavorRef。"
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 #, fuzzy
 msgid "min_count must be an integer value"
 msgstr "limit 参数必须是整数"
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 #, fuzzy
 msgid "max_count must be an integer value"
 msgstr "limit 参数必须是整数"
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr "无法找到请求的镜像"
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr "提供了无效的key_name。"
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 #, fuzzy
 msgid "HostId cannot be updated."
 msgstr "id不能是None"
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr "实例还没有调整大小。"
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr "confirm-resize中的错误 %s"
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr "revert-resize中的错误 %s"
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "重启的参数'type'既不是HARD也不是SOFT"
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr "缺少重启的参数'type'"
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr "重启中错误 %s"
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr "无法找到请求的类型。"
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 #, fuzzy
 msgid "Resize requires a flavor change."
 msgstr "调整大小需要尺寸的改变。"
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr "缺少属性imageRef"
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr "提供了无效的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr "缺少属性flavorRef"
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr "没有确定adminPass"
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr "无效的adminPass"
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr "无法解析元数据键/值对"
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "调整大小请求中的属性'flavorRef'无效。"
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "调整大小请求要求有属性'flavorRef'。"
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2445,19 +2433,19 @@ msgstr "调整大小请求要求有属性'flavorRef'。"
 msgid "Invalid request body"
 msgstr "无效的请求主体"
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr "无法解析请求中的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr "无法找到用来重新创建的镜像"
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr "实体createImage需要属性name"
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
@@ -2961,7 +2949,7 @@ msgstr "网络地址已存入openvpn配置"
 msgid "Netmask to push into openvpn config"
 msgstr "子网掩码已存入openvpn配置"
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "启动VPN %s"
@@ -3017,192 +3005,192 @@ msgstr "安全组 %s 不能比255个字符更长。"
 msgid "Metadata property value greater than 255 characters"
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备运行 %s 个实例"
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "准备尝试软删除实例 %s"
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 #, fuzzy
 msgid "No host for instance, deleting immediately"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 #, fuzzy
 msgid "host for instance is down, deleting from database"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "准备尝试停止实例 %s"
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "准备尝试启动实例 %s"
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "无法识别镜像类型 %s"
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。假定在迁移。"
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, 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:1681
+#: nova/compute/api.py:1685
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "密钥对名称长度必须在1到255个字符之间"
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既不是字符串也不是unicode"
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s 不能为空。"
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, 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:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "安全组id应该是整数"
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "添加安全组规则：%r"
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授权 %s 安全组入口权限"
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入口权限"
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr "创建参数必须是正整数"
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr "未找到要删除的实例类型 %s"
@@ -3211,78 +3199,87 @@ msgstr "未找到要删除的实例类型 %s"
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "无法加载虚拟驱动：%s"
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, 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:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute重启后，实例正在重启。"
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr "正在检查状态"
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+#, fuzzy
+msgid "Failed to dealloc network for deleted instance"
+msgstr "释放实例的网络"
+
+#: nova/compute/manager.py:549
 #, fuzzy, python-format
 msgid "Build error: %s"
 msgstr "数据库错误：%s"
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr "实例已经创建"
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3291,7 +3288,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3300,136 +3297,136 @@ msgstr ""
 "镜像 '%(image_id)s'  的大小为 %(size_bytes)d ，超过实例类型 instance_type 所允许的大小 "
 "%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr "正在启动虚拟机"
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr "实例网络设置失败"
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr "实例块设备设置失败"
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s。把实例的 vm_state设置为ERROR"
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "正在重新创建实例 %s"
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "正在重启虚拟机 %s"
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, 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:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, 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:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮换出%d个备份"
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜像 %s"
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 #, fuzzy
 msgid "Root password set"
 msgstr "实例 %s：Root密码已设置"
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 #, fuzzy
 msgid "error setting admin password"
 msgstr "设置管理员密码出错"
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, fuzzy, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
@@ -3438,136 +3435,136 @@ msgstr ""
 "试图把一个文件注入到没有运行的实例：%(instance_uuid)s (状态: %(current_power_state)s 预计: "
 "%(expected_state)s)"
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, fuzzy, python-format
 msgid "injecting file to %(path)s"
 msgstr "注入文件路径：'%s'"
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 #, fuzzy
 msgid "Unrescuing"
 msgstr "实例 %s：取消救援"
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr "目标与来源一样。"
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 #, fuzzy
 msgid "Pausing"
 msgstr "正在更新。"
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "实例 %s ：获取诊断"
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 #, fuzzy
 msgid "Reset network"
 msgstr "重置网络"
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 #, fuzzy
 msgid "Inject network info"
 msgstr "实例 %s：注入网络信息"
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 #, fuzzy
 msgid "Get console output"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "实例 %s：正在获得VNC控制台"
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, 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:2044
+#: nova/compute/manager.py:2087
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "卷 %(volume_id)s 从挂载点 %(mp)s 分离"
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "从未知实例%s中分离卷"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr "实例没有卷。"
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "预在线迁移在%(dest)s失败"
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "post_live_migration()已经启动。"
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3576,12 +3573,12 @@ msgstr ""
 "在线迁移：意外的错误：无法继承浮动ip。\n"
 "%(e)s"
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "把实例迁移到 %(dest)s 成功完成。"
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3589,137 +3586,137 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。”这个错误可以放心的忽略。"
 
-#: nova/compute/manager.py:2343
+#: nova/compute/manager.py:2397
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "迁移后操作启动"
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, 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:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 #, fuzzy
 msgid "In ERROR state"
 msgstr "节点处于未知的错误状态。"
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr "更新主机状态"
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, 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:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "实例未启动"
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, fuzzy, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr "检测标签名为 '%(name_label)s' 的实例，这些实例被标识为DELETED却仍然存在于主机上。"
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, fuzzy, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr "销毁标签名为 '%(name_label)s' 的实例，这些实例被标识为DELETED却仍然存在于主机上。"
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr "无法识别的FLAGS.running_deleted_instance_action的取值 '%(action)s'"
@@ -3946,56 +3943,52 @@ msgstr "接收到令牌：%(token)s, %(token_dict)s)"
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "检查令牌：%(token)s, %(token_valid)s)"
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr "使用空的请求上下文是不推荐的"
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "无法识别的 read_deleted 取值”%s“"
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 #, fuzzy
 msgid "Backend exists"
 msgstr "后台 %s"
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "没有id为%(sm_backend_id)s的后台配置"
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, fuzzy, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr "没有id为%(sm_backend_id)s的后台配置"
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 #, fuzzy
 msgid "Flavor exists"
 msgstr "类型：%s"
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, fuzzy, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr "类型 %(flavor_id)s 没有找到。"
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, fuzzy, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr "没有 sm_flavor 调用 %(sm_flavor)s"
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, fuzzy, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr "没有 sm_flavor 调用 %(sm_flavor)s"
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "没有id为 %(volume_id)s 的 sm_volume"
@@ -4300,7 +4293,31 @@ msgstr "%s 的配额超出，尝试分配地址"
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, fuzzy, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr "没有为实例 %(instance_id)s 找到卷。"
+
+#: nova/network/manager.py:656
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr "固定IP地址 %(address)s 已在使用。"
+
+#: nova/network/manager.py:677
+#, fuzzy, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
+
+#: nova/network/manager.py:685
+#, fuzzy, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr "固定IP地址 %(address)s 已在使用。"
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4308,41 +4325,41 @@ msgid ""
 "ignored."
 msgstr "数据库不一致：DNS域|%s| 在Nova数据库中注册，但是对浮动或者实例DNS驱动均不可见。将被忽略。"
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "域 |%(domain)s| 已经存在，把区域改变为 |%(av_zone)s|。"
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "域 |%(domain)s| 已经存在，把项目改变为 |%(project)s|。"
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "解除 %s 过期固定ip的关联"
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr "设置网络主机"
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 #, fuzzy
 msgid "network allocations"
 msgstr "实例 %s 的网络分配"
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, fuzzy, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr "为实例 |%(instance_id)s| 获取的网络：|%(networks)s|"
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 #, fuzzy
 msgid "network deallocation for instance"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4352,89 +4369,89 @@ msgstr ""
 "instance-dns-zone是 |%(domain)s|，该域位于区域 |%(zone)s| 中。实例|%(instance)s| 在区域 "
 "|%(zone2)s| 里。没有DNS记录将创建。"
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "租用的IP |%(address)s|"
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "没有关联的IP %s 被租用了"
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "没有分配的IP |%s| 被租用了"
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "释放的IP |%(address)s|"
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "没有关联的IP %s 被释放了"
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "没有租用的IP %s 被释放了"
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, fuzzy, python-format
 msgid "%s must be an integer"
 msgstr "offset 参数必须是整数"
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr "cidr 已经在使用"
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突"
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的较小的cidr (%(smaller)s) 冲突"
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr "网络已经存在。"
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除前必须与项目 %s 解除关联"
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "网络数量与VLAN起始数之和不能大于4049"
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4512,28 +4529,21 @@ msgstr "找不到适合id %(id)s 的浮动IP。"
 msgid "syslog facility must be one of: %s"
 msgstr "syslog设备必须作为一个 %s 。"
 
-#: nova/openstack/common/policy.py:149
-#, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
-msgstr ""
-
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:394
 #, fuzzy, python-format
-msgid "Failed to understand rule %(match)r"
+msgid "Failed to understand rule %(rule)s"
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
-msgstr ""
-
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:404
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
+#: nova/openstack/common/policy.py:679
+#, fuzzy, python-format
+msgid "Failed to understand rule %(rule)r"
+msgstr "注入文件失败：%(resp)r"
+
 #: nova/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -5166,19 +5176,19 @@ msgstr "已经附加"
 msgid "already detached"
 msgstr "已经分离"
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr "请扩展模拟的 libvirt 模块来支持标记"
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5263,12 +5273,12 @@ msgstr "给定数据：%s"
 msgid "Result data: %s"
 msgstr "结果数据：%s"
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代理"
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代理文件"
@@ -5285,18 +5295,18 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 #, fuzzy
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5320,59 +5330,59 @@ msgstr "_get: %s"
 msgid "_get_all: %s"
 msgstr "_get_all: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr "test_snapshot_create: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr "test_snapshot_create: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr "test_snapshot_create_force: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr "test_snapshot_create_force: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr "test_snapshot_show: resp=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr "test_snapshot_detail: resp_dict=%s"
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr "正在运行的实例：%s"
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "终止实例之后：%s"
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制杀死实例后：%s"
@@ -5488,7 +5498,7 @@ msgstr "意外的状态码"
 msgid "Decoding JSON: %s"
 msgstr "解码JSON：%s"
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5516,16 +5526,16 @@ msgstr "添加安全组规则：%r"
 msgid "Adding provider rule: %s"
 msgstr "添加提供者规则：%s"
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info'解析失败"
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr "fmt=%(fmt)s 由 %(backing_file)s 支持"
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "转化为裸格式，但目前格式是 %s"
@@ -5722,7 +5732,7 @@ msgid "instance %s: finished toXML method"
 msgstr "实例 %s：方法toXML 完成"
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5737,7 +5747,7 @@ msgstr "#### RLK: cpu_arch = %s "
 msgid "Updating!"
 msgstr "正在更新。"
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "正在更新主机状态"
@@ -6291,7 +6301,7 @@ msgstr "正在创建存储库 %s"
 msgid "Removing existing folder %s "
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, fuzzy, python-format
 msgid "block device info: %s"
 msgstr "块设备列表 block_device_list %s"
@@ -6316,7 +6326,7 @@ msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Attach volume failed: %s"
 msgstr "分离卷 %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "无法附加卷到实例 %s"
@@ -6351,7 +6361,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "移除容器失败：%s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator名字"
 
@@ -6469,212 +6479,212 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr "块设备列表 block_device_list %s"
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, 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:482
+#: nova/virt/libvirt/driver.py:480
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr "实例销毁成功。"
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, 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:537
+#: nova/virt/libvirt/driver.py:535
 #, 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:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "删除实例文件 %(target)s"
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr "附加 LXC 块设备"
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr "分离LXC 块设备"
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "重新启动实例失败"
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr "实例在运行"
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "用户没有管理员权限"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
-msgstr ""
-
-#: nova/virt/libvirt/driver.py:1267
+#: nova/virt/libvirt/driver.py:1275
 msgid "Creating image"
 msgstr "正在创建镜像"
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
+msgstr ""
+
+#: nova/virt/libvirt/driver.py:1411
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr "将 %(injection)s 注入到镜像 %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr "忽略向镜像 %(img_id)s  注入的数据的错误 (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr "正在启动 toXML 方法"
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr "toXML方法完成"
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(不支持getVersion)"
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -6683,7 +6693,7 @@ msgstr ""
 "无法迁移%(instance_id)s 到 %(dest)s 上：缺少磁盘(主机:%(available)s <= "
 "实例:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -6692,7 +6702,7 @@ msgstr ""
 "已启动实例的CPU信息：\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6707,54 +6717,54 @@ msgstr ""
 "\n"
 "参考 %(u)s"
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, fuzzy, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr "预在线迁移在%(dest)s失败"
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr "plug_vifs() 失败%(cnt)d 次。最多重新尝试 %(max_retry)d 次在主机 %(hostname)s。"
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "因它像卷，所以跳过 %(path)s"
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "实例 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "实例 %s 成功运行。"
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
@@ -6796,64 +6806,64 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr "未知的磁盘镜像句柄：%s"
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s 是一个正确的实例名称"
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s 有一个磁盘文件"
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "实例 %(instance)s  由文件 %(backing)s 来备份"
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr "实例 %(instance)s 正在使用的备份文件 %(backing)s 没有出现在镜像服务里。"
 
-#: nova/virt/libvirt/imagecache.py:236
+#: nova/virt/libvirt/imagecache.py:234
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像验证失败"
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像验证跳过，没有散列存储"
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, fuzzy, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "基文件太新不需要删除：%s"
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：正在检查中"
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, fuzzy, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
@@ -6862,7 +6872,7 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s)：正在使用中：本地节点 %(local)d, 远程节点 "
 "%(remote)d"
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, fuzzy, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
@@ -6871,56 +6881,56 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s)：警告 -- 使用中缺少基文件! 实例： "
 "%(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：在使用中： 在远程节点 (%(remote)d 上"
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像不在使用中"
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像在使用中"
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "跳过验证，在 %s 上没有基础目录"
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr "验证基础镜像"
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "未知的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr "活跃的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "损坏的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr "可删除的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr "确认完成"
 
@@ -6949,31 +6959,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, fuzzy, python-format
 msgid "Reading image info file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, fuzzy, python-format
 msgid "Read: %s"
 msgstr "_create: %s"
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, fuzzy, python-format
 msgid "Writing image info file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, fuzzy, python-format
 msgid "Wrote: %s"
 msgstr "重写%s"
@@ -6994,19 +7004,19 @@ msgstr "保证桥 %s"
 msgid "Failed while unplugging vif"
 msgstr "移除实例”%s“的虚拟网络设备时失败"
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重试。尝试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）"
@@ -7607,24 +7617,24 @@ msgstr "正在获取镜像 %s 的大小"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "获得大小为 %(size)s 的镜像目的为了 %(image)s"
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, 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:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, 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:92
+#: nova/virt/xenapi/agent.py:99
 #, fuzzy, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
@@ -7633,68 +7643,84 @@ msgstr ""
 "%(method)s 的代理调用返回无效的响应：%(ret)r。虚拟机id=%(instance_uuid)s; path=%(path)s; "
 "args=%(addl_args)r"
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr "查询代理版本失败：%(resp)r"
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr "查询代理版本"
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "把代理更新为 %s"
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr "更新代理失败：%(resp)r"
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr "设置管理员密码"
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr "交换钥匙失败：%(resp)r"
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr "更新密码失败：%(resp)r"
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr "重置网络"
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, fuzzy, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。"
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr "该镜像有XenServer工具，但是不能进行网络注入"
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr "没有在该镜像上安装XenServer工具"
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 #, fuzzy
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
@@ -7704,58 +7730,58 @@ msgstr ""
 "针对use connection_type=xenapi必须指定xenapi_connection_url, "
 "xenapi_connection_username (可选) 和 xenapi_connection_password"
 
-#: nova/virt/xenapi/driver.py:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr "不支持在XenServer启动主机"
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr "产生 NotImplemented 错误"
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake 没有 %s 的实现"
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "正在调用 %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7860,70 +7886,70 @@ msgstr ""
 "网络 %(bridge)s 的 PIF %(pif_rec['uuid'])s  有VLAN id %(pif_vlan)d。期待的数目是 "
 "%(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 #, fuzzy
 msgid "Created VM"
 msgstr "_create: %s"
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, fuzzy
 msgid "VM already halted, skipping shutdown..."
 msgstr "虚拟机 %(instance_uuid)s 已经终止，跳过关闭..."
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "没有在实例 %s 找到VBD"
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "已经分离"
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "无法移除 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "无法销毁 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "无法销毁 VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -7932,357 +7958,346 @@ msgstr ""
 "创建了 VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) 位置在"
 " %(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:528
+#: nova/virt/xenapi/vm_utils.py:454
+#, fuzzy
+msgid "SR not present and could not be introduced"
+msgstr "无法找到实例"
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "克隆了 VDI %(vdi_ref)s 对象来自VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "未找到 %(vm_ref)s 的主VDI"
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 #, fuzzy
 msgid "Starting snapshot for VM"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "请求xapi 上传 %(vdi_uuids)s 作为镜像ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr "只能在ext类型的缺省本地存储库支持快速克隆。这个系统的存储库类型为 %(sr_type)s。忽略此 cow 标记。"
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, fuzzy, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' 返回“%(vdi_type)s”类型的VDI，其UUID为 “%(vdi_uuid)s”"
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, fuzzy, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr "请求 xapi 获取 vhd 镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, 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:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d，allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr "镜像大小 %(size_bytes)d 超过instance_type所允许的小大 %(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, fuzzy, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, 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:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "将VDI %s 复制到dom0的/boot/guest下"
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "内核/内存盘 VDI %s 已销毁"
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "实例 %s：获取Glance镜像失败"
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, 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:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "为PV内核查询vdi %s"
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "未知的镜像格式 %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s 依然可用"
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "重新扫描存储库 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "标记sr_matching_filter '%s' 没有遵循格式要求"
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr "无法找到content-type ISO的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO：正在查看存储库 %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr "ISO：非iso内容"
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO：iso content_type，没有 'i18n-key' 键"
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 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:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: 存储库符合标准"
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, 正在查看是否是本地的主机"
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s 消失了"
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, 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:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr "ISO：含有本地PBD的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "无法获取包含服务器详细情况的RRD XML更新：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "来自Xenserver无效的统计数据：%s"
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, 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:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "VHD coalesce 将要超过(%(max_attempts)d)，放弃中..."
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "等待设备 %s 创建超时"
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "插入VBD %s... "
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "插入VBD %s 完成。"
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, 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:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, 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:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "正在销毁VDI为 %s 的 VBD "
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "已经销毁VDI为 %s 的 VBD"
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "对 %s 运行pygrub"
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "找到Xen内核 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "没有找到Xen内核。正在启动HVM。"
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr "分区："
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, 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:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "完成写入分区表 %s 。"
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。"
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr "该镜像有XenServer工具，但是不能进行网络注入"
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr "没有在该镜像上安装XenServer工具"
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr "直接操作接口文件"
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "挂载文件系统失败(期望的是非Linux实例)：%s"
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
@@ -8292,194 +8307,194 @@ msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
 msgid "Starting instance"
 msgstr "正在启动虚拟机"
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "从 dom0 中移除内核/内存盘文件"
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, fuzzy, python-format
 msgid "Block device information present: %s"
 msgstr "block_device_mapping %s"
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "在数据库更新卷失败"
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 #, fuzzy
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr "正在自动配置实例 %(instance_uuid)s 的磁盘，尝试调整分区大小..."
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 #, fuzzy
 msgid "Starting VM"
 msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "%(hypervisor)s/%(os)s/%(architecture)s 最新的agent build 是 %(version)s 版本"
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "没有找到 %(hypervisor)s/%(os)s/%(architecture)s 的代理创建"
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "实例代理版本：%s"
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr "设置VCPU 权重"
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, fuzzy, python-format
 msgid "Could not find VM with name %s"
 msgstr "找不到VDI ref"
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 #, fuzzy
 msgid "Finished snapshot and upload for VM"
 msgstr "快照完毕并为虚拟机 %s 上传"
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr "将 vhd 转移到新主机失败"
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, fuzzy, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(cow_uuid)s 由 %(old_gb)dGB 调小到  %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到  %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 #, fuzzy
 msgid "Resize complete"
 msgstr "调整实例 %s 的大小完毕"
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 #, fuzzy
 msgid "Unable to find root VBD/VDI for VM"
 msgstr "无法为VDI %s 找到VBD"
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, fuzzy, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 #, fuzzy
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr "实例 %(instance_uuid)s 使用RAW或者VHD，跳过内核和内存盘的删除"
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "实例拥有内核或者内存盘，但不是二者均有"
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr "内核/内存盘文件移除了"
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 #, fuzzy
 msgid "Destroying VM"
 msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr "虚拟机不存在，跳过销毁..."
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "实例已处于救援模式：%s"
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 #, fuzzy
 msgid "VM is not present, skipping power off..."
 msgstr "虚拟机不存在，跳过销毁..."
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的重启"
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 #, fuzzy
 msgid "Automatically hard rebooting"
 msgstr "自动冷重启 %d"
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "为虚拟机注入网络信息到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 #, fuzzy
 msgid "Creating vifs"
 msgstr "正在创建镜像"
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 #, fuzzy
 msgid "Injecting hostname to xenstore"
 msgstr "为虚拟机注入hostname到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 #, fuzzy
 msgid "Migrate Send failed"
 msgstr "创建失败"
@@ -8512,7 +8527,7 @@ msgid "introducing sr within volume_utils"
 msgstr "在volume_utils里引入sr"
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "将 %(label)s 作为 %(sr_ref)s 引入。"
@@ -8525,7 +8540,7 @@ msgstr "为存储库创建pbd"
 msgid "Plugging SR"
 msgstr "插入存储库"
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr "无法引入存储库"
 
@@ -8587,12 +8602,17 @@ msgstr "在存储库 %s 寻找VDIs出错"
 msgid "Unable to find vbd for vdi %s"
 msgstr "无法为VDI %s 找到VBD"
 
-#: nova/virt/xenapi/volume_utils.py:304
-#, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#: nova/virt/xenapi/volume_utils.py:281
+#, fuzzy, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr "无法获得目标信息 %(data)s, %(mountpoint)s"
+
+#: nova/virt/xenapi/volume_utils.py:309
+#, fuzzy, python-format
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr "无法获得目标信息 %(data)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "挂载点无法被翻译：%s"
@@ -8641,47 +8661,47 @@ msgstr "在xapi数据库没有找到存储库 %s"
 msgid "Could not forget SR"
 msgstr "不能遗忘存储库"
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "无法在存储库 %(sr_ref)s 上为实例 %(instance_name)s 创建 VDI"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "存储库 %(sr_ref)s 不能为实例%(instance_name)s使用"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 附加到实例 %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "分离_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "无法找到 %s 卷"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "无法分离 %s 卷"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr "无法销毁VBD %s"
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr "净化存储库 %s 出错"
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离"
@@ -9248,52 +9268,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr "指定san_password或者san_private_key"
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr "san_ip必须设置"
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "没有为 %(zfs_poolname)s 找到LUID。Output=%(out)s"
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr "返回CLIQ命令 %s"
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr "CLIQ命令 %(verb)s %(cliq_args)s 错误格式的响应。Result=%(out)s"
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr "在运行CLIQ命令 %(verb)s %(cliq_args)s 时发生错误。输出结果 Result=%(out)s"
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr "集群 %(cluster_name)s 有意外数量的虚拟 ip 地址。输出结果 Result=%(_xml)s"
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr "卷信息：%(volume_name)s => %(volume_attributes)s"
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr "不支持local_path"
 
@@ -10070,3 +10090,30 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr "后台 %s"
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr "无效的服务器状态：%(status)s"
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr "使用空的请求上下文是不推荐的"
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 19dcae447..396a005ff 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: 2012-10-21 00:02+0000\n"
+"POT-Creation-Date: 2012-10-26 00:02+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"
@@ -165,7 +165,7 @@ msgid "Volume %(volume_id)s is still attached, detach volume first."
 msgstr ""
 
 #: nova/exception.py:239 nova/api/ec2/cloud.py:389 nova/api/ec2/cloud.py:414
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2190
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2194
 msgid "Keypair data is invalid"
 msgstr "無效的Keypair"
 
@@ -189,158 +189,162 @@ msgstr ""
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1266
+#: nova/exception.py:263 nova/api/openstack/compute/servers.py:1287
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
 #: nova/exception.py:267
+msgid "Invalid metadata size"
+msgstr ""
+
+#: nova/exception.py:271
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:271 nova/api/ec2/cloud.py:571
+#: nova/exception.py:275 nova/api/ec2/cloud.py:571
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:275
+#: nova/exception.py:279
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:279
+#: nova/exception.py:283
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:283
+#: nova/exception.py:287
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:290
+#: nova/exception.py:294
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:294
+#: nova/exception.py:298
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:303
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:303
+#: nova/exception.py:307
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:307
+#: nova/exception.py:311
 #, 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:312
+#: nova/exception.py:316
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:316
+#: nova/exception.py:320
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:320
+#: nova/exception.py:324
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:324
+#: nova/exception.py:328
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:328
+#: nova/exception.py:332
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:332
+#: nova/exception.py:336
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:336
+#: nova/exception.py:340
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:340
+#: nova/exception.py:344
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:344
+#: nova/exception.py:348
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:348
+#: nova/exception.py:352
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:352
+#: nova/exception.py:356
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:361
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:365
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:366
+#: nova/exception.py:370
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:375
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:375
+#: nova/exception.py:379
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:383
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:383
+#: nova/exception.py:387
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:387
+#: nova/exception.py:391
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:391
+#: nova/exception.py:395
 #, 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:397
+#: nova/exception.py:401
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -348,132 +352,132 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:408
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:408
+#: nova/exception.py:412
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:412
+#: nova/exception.py:416
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:416
+#: nova/exception.py:420
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:420
+#: nova/exception.py:424
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:428
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:433
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:434
+#: nova/exception.py:438
 #, fuzzy, python-format
 msgid "Could not find driver for compute_driver %(name)s"
 msgstr "找不到Volume %s"
 
-#: nova/exception.py:438
+#: nova/exception.py:442
 #, python-format
 msgid "Volume %(volume_id)s persistence file could not be found."
 msgstr ""
 
-#: nova/exception.py:442
+#: nova/exception.py:446
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:450
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:455
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:456
+#: nova/exception.py:460
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:460
+#: nova/exception.py:464
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:465
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:474
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:478
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:482
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:487
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:487
+#: nova/exception.py:491
 #, fuzzy, python-format
 msgid "Failed to create iscsi target for volume %(volume_id)s."
 msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/exception.py:491
+#: nova/exception.py:495
 #, python-format
 msgid "Failed to remove iscsi target for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:495
+#: nova/exception.py:499
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:499
+#: nova/exception.py:503
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:503
+#: nova/exception.py:507
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:507
+#: nova/exception.py:511
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:511
+#: nova/exception.py:515
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -481,735 +485,735 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:522
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:526
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:530
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:534
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:538
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:538
+#: nova/exception.py:542
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:542
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:546
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:558
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:562
 #, 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:563
+#: nova/exception.py:567
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:571
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:575
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:575
+#: nova/exception.py:579
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:579
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:604
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:605
+#: nova/exception.py:609
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:614
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:615
+#: nova/exception.py:619
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:623
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:627
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:644
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:648
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:652
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:656
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:660
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:665
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:670
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:674
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:678
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:682
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:686
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:690
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:694
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:698
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:698
+#: nova/exception.py:702
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:706
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:710
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:714
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:723
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:727
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:731
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:735
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:739
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:743
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:747
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:751
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:755
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:756
+#: nova/exception.py:760
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:764
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:765
+#: nova/exception.py:769
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:774
+#: nova/exception.py:778
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:779
+#: nova/exception.py:783
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:783
+#: nova/exception.py:787
 #, 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:789
+#: nova/exception.py:793
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:801
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:819
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:823
 #, python-format
 msgid "Flavor access not found for %(flavor_id) / %(project_id) combination."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:828
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:832
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:837
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:841
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:842
+#: nova/exception.py:846
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:856
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:860
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:864
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:910
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:914
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:918
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:922
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:926
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:928
+#: nova/exception.py:932
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:932
+#: nova/exception.py:936
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:940
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:944
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:948
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:952
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:956
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:960
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:964
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:968
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:972
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:979
 #, 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:980
+#: nova/exception.py:984
 msgid "Maximum volume size exceeded"
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:988
 #, python-format
 msgid "Maximum number of volumes allowed (%(allowed)d) exceeded"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:992
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:996
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1000
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1004
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1008
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1012
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1016
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1020
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1025
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1029
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1037
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1046
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1050
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1051
+#: nova/exception.py:1055
 #, python-format
 msgid "Bad or unexpected response from the storage volume backend API: %(data)s"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1060
 #, fuzzy
 msgid "Unknown NFS exception"
 msgstr "發生一個未知例外"
 
-#: nova/exception.py:1060
+#: nova/exception.py:1064
 msgid "No mounted NFS shares found"
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1068
 #, python-format
 msgid "There is no share which can host %(volume_size)sG"
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1072
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1076
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1078
+#: nova/exception.py:1082
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1082
+#: nova/exception.py:1086
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1086
+#: nova/exception.py:1090
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1094
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1098
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1102
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1106
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1110
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1114
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1118
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1122
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1123
+#: nova/exception.py:1127
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1128
+#: nova/exception.py:1132
 #, 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:1134
+#: nova/exception.py:1138
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1138
+#: nova/exception.py:1142
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1143
+#: nova/exception.py:1147
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1147
+#: nova/exception.py:1151
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1351,138 +1355,126 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:162
+#: nova/utils.py:160
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:168
-msgid ""
-"The root_helper option (which lets you specify a root wrapper different "
-"from nova-rootwrap, and defaults to using sudo) is now deprecated. You "
-"should use the rootwrap_config option instead."
-msgstr ""
-
-#: nova/utils.py:183
+#: nova/utils.py:171
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:199 nova/utils.py:277 nova/virt/powervm/common.py:82
+#: nova/utils.py:187 nova/utils.py:265 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:212
+#: nova/utils.py:200
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:252
+#: nova/utils.py:240
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:254
+#: nova/utils.py:242
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:258
+#: nova/utils.py:246
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:281
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:452
+#: nova/utils.py:440
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:455
+#: nova/utils.py:443
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:490
+#: nova/utils.py:478
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:502
-#, python-format
-msgid "backend %s"
-msgstr ""
-
-#: nova/utils.py:552
+#: nova/utils.py:539
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:636
+#: nova/utils.py:623
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: nova/utils.py:719
+#: nova/utils.py:706
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:723
+#: nova/utils.py:710
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:749
+#: nova/utils.py:736
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:890
+#: nova/utils.py:877
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:919
+#: nova/utils.py:906
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1059
+#: nova/utils.py:1046
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1137
+#: nova/utils.py:1124
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1255 nova/virt/configdrive.py:145
+#: nova/utils.py:1242 nova/virt/configdrive.py:150
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:74
+#: nova/wsgi.py:85
 #, python-format
 msgid "%(name)s listening on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:97
+#: nova/wsgi.py:109
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:115
+#: nova/wsgi.py:127
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:184
+#: nova/wsgi.py:196
 msgid "You must implement __call__"
 msgstr ""
 
-#: nova/wsgi.py:370
+#: nova/wsgi.py:382
 #, python-format
 msgid "Loading app %(name)s from %(path)s"
 msgstr ""
@@ -1894,14 +1886,14 @@ msgstr ""
 msgid "Extended resource: %s"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:168
+#: nova/api/openstack/__init__.py:171
 #, python-format
 msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
 
-#: nova/api/openstack/__init__.py:173
+#: nova/api/openstack/__init__.py:176
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
@@ -1929,7 +1921,7 @@ msgstr ""
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:539
+#: nova/api/openstack/common.py:215 nova/api/openstack/compute/servers.py:540
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
@@ -2192,222 +2184,217 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:163
+#: nova/api/openstack/compute/server_metadata.py:166
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:145
-#: nova/api/openstack/compute/server_metadata.py:156
+#: nova/api/openstack/compute/server_metadata.py:148
+#: nova/api/openstack/compute/server_metadata.py:159
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:447
-#: nova/api/openstack/compute/servers.py:459
-#: nova/api/openstack/compute/servers.py:555
-#: nova/api/openstack/compute/servers.py:711
-#: nova/api/openstack/compute/servers.py:966
-#: nova/api/openstack/compute/servers.py:1069
-#: nova/api/openstack/compute/servers.py:1219
+#: nova/api/openstack/compute/servers.py:449
+#: nova/api/openstack/compute/servers.py:461
+#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:724
+#: nova/api/openstack/compute/servers.py:985
+#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1238
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:491
-#, python-format
-msgid "Invalid server status: %(status)s"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:499
+#: nova/api/openstack/compute/servers.py:500
 msgid "Invalid changes-since value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:518
+#: nova/api/openstack/compute/servers.py:519
 msgid "Only administrators may list deleted instances"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:563
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:566
+#: nova/api/openstack/compute/servers.py:567
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:587
+#: nova/api/openstack/compute/servers.py:588
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:590
+#: nova/api/openstack/compute/servers.py:591
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:594
+#: nova/api/openstack/compute/servers.py:595
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:613
+#: nova/api/openstack/compute/servers.py:626
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:616
+#: nova/api/openstack/compute/servers.py:629
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:626
+#: nova/api/openstack/compute/servers.py:639
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:636
+#: nova/api/openstack/compute/servers.py:649
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:649
+#: nova/api/openstack/compute/servers.py:662
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:655
+#: nova/api/openstack/compute/servers.py:668
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:658
+#: nova/api/openstack/compute/servers.py:671
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:684
+#: nova/api/openstack/compute/servers.py:697
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:691
+#: nova/api/openstack/compute/servers.py:704
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:698
+#: nova/api/openstack/compute/servers.py:711
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:740
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:776
-#: nova/api/openstack/compute/servers.py:876
+#: nova/api/openstack/compute/servers.py:789
+#: nova/api/openstack/compute/servers.py:895
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:812
+#: nova/api/openstack/compute/servers.py:829
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:815
+#: nova/api/openstack/compute/servers.py:832
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:820
+#: nova/api/openstack/compute/servers.py:837
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:823
+#: nova/api/openstack/compute/servers.py:840
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:826
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:873
+#: nova/api/openstack/compute/servers.py:892
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:879
+#: nova/api/openstack/compute/servers.py:898
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:958
+#: nova/api/openstack/compute/servers.py:977
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1023
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:990
+#: nova/api/openstack/compute/servers.py:1009
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1029
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1023
+#: nova/api/openstack/compute/servers.py:1042
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1027
+#: nova/api/openstack/compute/servers.py:1046
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1040
+#: nova/api/openstack/compute/servers.py:1059
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1071
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1055
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1079
+#: nova/api/openstack/compute/servers.py:1098
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1107
 #: nova/api/openstack/volume/volumes.py:263
 #: nova/api/openstack/volume/volumes.py:267
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1097
+#: nova/api/openstack/compute/servers.py:1116
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1110
+#: nova/api/openstack/compute/servers.py:1129
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1114
-#: nova/api/openstack/compute/servers.py:1314
+#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:1335
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1125
+#: nova/api/openstack/compute/servers.py:1144
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1138
+#: nova/api/openstack/compute/servers.py:1157
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1141
+#: nova/api/openstack/compute/servers.py:1160
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1159
+#: nova/api/openstack/compute/servers.py:1178
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:75
@@ -2415,19 +2402,19 @@ msgstr ""
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1164
+#: nova/api/openstack/compute/servers.py:1183
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1224
+#: nova/api/openstack/compute/servers.py:1245
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1257
+#: nova/api/openstack/compute/servers.py:1278
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1341
+#: nova/api/openstack/compute/servers.py:1362
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2919,7 +2906,7 @@ msgstr ""
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:104
+#: nova/cloudpipe/pipelib.py:105
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
@@ -2972,184 +2959,184 @@ msgstr ""
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:498
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:565
+#: nova/compute/api.py:569
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:592
+#: nova/compute/api.py:596
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:824
+#: nova/compute/api.py:828
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:841
+#: nova/compute/api.py:845
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:925
+#: nova/compute/api.py:929
 msgid "host for instance is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:946
+#: nova/compute/api.py:950
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:986
+#: nova/compute/api.py:990
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1000
+#: nova/compute/api.py:1004
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1064 nova/volume/api.py:264
+#: nova/compute/api.py:1068 nova/volume/api.py:264
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1199
+#: nova/compute/api.py:1203
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1308
+#: nova/compute/api.py:1312
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:1630
+#: nova/compute/api.py:1634
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1639
+#: nova/compute/api.py:1643
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1681
+#: nova/compute/api.py:1685
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:1853
+#: nova/compute/api.py:1857
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:1861
+#: nova/compute/api.py:1865
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:1929
+#: nova/compute/api.py:1933
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2014
+#: nova/compute/api.py:2018
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2163
+#: nova/compute/api.py:2167
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2167
+#: nova/compute/api.py:2171
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2268
+#: nova/compute/api.py:2272
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2271
+#: nova/compute/api.py:2275
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2279
+#: nova/compute/api.py:2283
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2285
+#: nova/compute/api.py:2289
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2305
+#: nova/compute/api.py:2309
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2308
+#: nova/compute/api.py:2312
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2315
+#: nova/compute/api.py:2319
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2380
+#: nova/compute/api.py:2384
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2388
+#: nova/compute/api.py:2392
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2391
+#: nova/compute/api.py:2395
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2648
+#: nova/compute/api.py:2652
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2657
+#: nova/compute/api.py:2661
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2660
+#: nova/compute/api.py:2664
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2671
+#: nova/compute/api.py:2675
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:61
+#: nova/compute/instance_types.py:63
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:70 nova/compute/instance_types.py:78
+#: nova/compute/instance_types.py:72 nova/compute/instance_types.py:80
 msgid "create arguments must be positive integers"
 msgstr ""
 
-#: nova/compute/instance_types.py:92 nova/volume/volume_types.py:41
+#: nova/compute/instance_types.py:94 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:102
+#: nova/compute/instance_types.py:104
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
@@ -3158,488 +3145,496 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:228
+#: nova/compute/manager.py:229
+msgid "Compute driver option required, but not specified"
+msgstr ""
+
+#: nova/compute/manager.py:232
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:234
+#: nova/compute/manager.py:238
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:269
+#: nova/compute/manager.py:273
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:297
+#: nova/compute/manager.py:301
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:311
+#: nova/compute/manager.py:315
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:335
+#: nova/compute/manager.py:339
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:344
+#: nova/compute/manager.py:351
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:417
+#: nova/compute/manager.py:424
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:517
+msgid "Failed to dealloc network for deleted instance"
+msgstr ""
+
+#: nova/compute/manager.py:549
 #, python-format
 msgid "Build error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:553
+#: nova/compute/manager.py:566
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:583
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:575
+#: nova/compute/manager.py:588
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:594
 #, python-format
 msgid "Re-scheduling instance: attempt %d"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:619
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:637
+#: nova/compute/manager.py:650
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:680
+#: nova/compute/manager.py:693
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:699
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:696
+#: nova/compute/manager.py:709
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:717
+#: nova/compute/manager.py:730
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:721
+#: nova/compute/manager.py:734
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:734
+#: nova/compute/manager.py:747
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:752
+#: nova/compute/manager.py:765
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:776
+#: nova/compute/manager.py:789
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:848
+#: nova/compute/manager.py:861
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:892
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:882
+#: nova/compute/manager.py:895
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:889
+#: nova/compute/manager.py:902
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:913
+#: nova/compute/manager.py:926
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:948 nova/compute/manager.py:1745
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:966 nova/compute/manager.py:1788
+#: nova/compute/manager.py:2973
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1030
+#: nova/compute/manager.py:1048
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1127
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1129
+#: nova/compute/manager.py:1147
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1156
 #, fuzzy, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1193
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1181
+#: nova/compute/manager.py:1199
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1246
+#: nova/compute/manager.py:1269
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1252
+#: nova/compute/manager.py:1275
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1257
+#: nova/compute/manager.py:1280
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1288
+#: nova/compute/manager.py:1311
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1295
+#: nova/compute/manager.py:1318
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1305
+#: nova/compute/manager.py:1328
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1321
+#: nova/compute/manager.py:1344
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1329
+#: nova/compute/manager.py:1352
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1344
+#: nova/compute/manager.py:1367
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1348
+#: nova/compute/manager.py:1371
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1361
+#: nova/compute/manager.py:1384
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1388
+#: nova/compute/manager.py:1411
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1409
+#: nova/compute/manager.py:1432
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1573
+#: nova/compute/manager.py:1606
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1591
+#: nova/compute/manager.py:1624
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1798
+#: nova/compute/manager.py:1841
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1815
+#: nova/compute/manager.py:1858
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1853
+#: nova/compute/manager.py:1896
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1883
+#: nova/compute/manager.py:1926
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1899
+#: nova/compute/manager.py:1942
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1904
+#: nova/compute/manager.py:1947
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1907
+#: nova/compute/manager.py:1950
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1967
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1949
+#: nova/compute/manager.py:1992
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1977
+#: nova/compute/manager.py:2020
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2020
+#: nova/compute/manager.py:2063
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2029
+#: nova/compute/manager.py:2072
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2044
+#: nova/compute/manager.py:2087
 #, 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:2073
+#: nova/compute/manager.py:2116
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2077
+#: nova/compute/manager.py:2120
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:2090
+#: nova/compute/manager.py:2133
 #, fuzzy, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2226
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2236
+#: nova/compute/manager.py:2286
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2262
+#: nova/compute/manager.py:2312
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2291
+#: nova/compute/manager.py:2345
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2299
+#: nova/compute/manager.py:2353
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2301
+#: nova/compute/manager.py:2355
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2381
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2329
+#: nova/compute/manager.py:2383
 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:2343
+#: nova/compute/manager.py:2397
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2474
+#: nova/compute/manager.py:2528
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2500
+#: nova/compute/manager.py:2554
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2505
+#: nova/compute/manager.py:2559
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2514
+#: nova/compute/manager.py:2568
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2521
+#: nova/compute/manager.py:2575
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2525
+#: nova/compute/manager.py:2579
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2586
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2540
+#: nova/compute/manager.py:2594
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2557
+#: nova/compute/manager.py:2611
 #, 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:2575
+#: nova/compute/manager.py:2629
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2598
+#: nova/compute/manager.py:2652
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2663
+#: nova/compute/manager.py:2717
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2689
+#: nova/compute/manager.py:2743
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2695 nova/compute/manager.py:2733
+#: nova/compute/manager.py:2749 nova/compute/manager.py:2787
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:2720
+#: nova/compute/manager.py:2774
 #, 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:2757
+#: nova/compute/manager.py:2811
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2769 nova/compute/manager.py:2780
-#: nova/compute/manager.py:2794
+#: nova/compute/manager.py:2823 nova/compute/manager.py:2834
+#: nova/compute/manager.py:2848
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:2774
+#: nova/compute/manager.py:2828
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2787
+#: nova/compute/manager.py:2841
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:2803
+#: nova/compute/manager.py:2857
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:2811
+#: nova/compute/manager.py:2865
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2824
+#: nova/compute/manager.py:2878
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2873
+#: nova/compute/manager.py:2927
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2880
+#: nova/compute/manager.py:2934
 #, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2887
+#: nova/compute/manager.py:2941
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
@@ -3866,54 +3861,50 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:57
-msgid "Use of empty request context is deprecated"
-msgstr ""
-
-#: nova/db/sqlalchemy/api.py:213
+#: nova/db/sqlalchemy/api.py:206
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2777
+#: nova/db/sqlalchemy/api.py:2783
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4678
+#: nova/db/sqlalchemy/api.py:4684
 msgid "Backend exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4698 nova/db/sqlalchemy/api.py:4724
+#: nova/db/sqlalchemy/api.py:4704 nova/db/sqlalchemy/api.py:4730
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4736
+#: nova/db/sqlalchemy/api.py:4742
 #, python-format
 msgid "No backend config with sr uuid %(sr_uuid)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4770
+#: nova/db/sqlalchemy/api.py:4776
 msgid "Flavor exists"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4785
+#: nova/db/sqlalchemy/api.py:4791
 #, python-format
 msgid "%(sm_flavor_id) flavor not found"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4804
+#: nova/db/sqlalchemy/api.py:4810
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4821
+#: nova/db/sqlalchemy/api.py:4827
 #, python-format
 msgid "No sm_flavor called %(sm_flavor_label)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4859
+#: nova/db/sqlalchemy/api.py:4865
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -4208,7 +4199,31 @@ msgstr ""
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:670
+#: nova/network/manager.py:649
+#, python-format
+msgid "Starting migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:656
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notmigrate it "
+msgstr ""
+
+#: nova/network/manager.py:677
+#, python-format
+msgid "Finishing migration network for instance %(instance_uuid)s"
+msgstr ""
+
+#: nova/network/manager.py:685
+#, python-format
+msgid ""
+"Floating ip address |%(address)s| no longer belongs to instance "
+"%(instance_uuid)s. Will notsetup it."
+msgstr ""
+
+#: nova/network/manager.py:732
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4216,39 +4231,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:716
+#: nova/network/manager.py:778
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:788
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:840
+#: nova/network/manager.py:902
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:844
+#: nova/network/manager.py:906
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:958
+#: nova/network/manager.py:1020
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:963
+#: nova/network/manager.py:1025
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:993
+#: nova/network/manager.py:1055
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1216
+#: nova/network/manager.py:1278
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4256,89 +4271,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1295
+#: nova/network/manager.py:1357
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1316
+#: nova/network/manager.py:1378
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1320
+#: nova/network/manager.py:1382
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1390
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1333
+#: nova/network/manager.py:1395
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1337
+#: nova/network/manager.py:1399
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1340
+#: nova/network/manager.py:1402
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1359
+#: nova/network/manager.py:1421
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1383
+#: nova/network/manager.py:1445
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1403
+#: nova/network/manager.py:1465
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1481
+#: nova/network/manager.py:1543
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1484
+#: nova/network/manager.py:1546
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1495
+#: nova/network/manager.py:1557
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1554
+#: nova/network/manager.py:1616
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1574
+#: nova/network/manager.py:1636
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2020
+#: nova/network/manager.py:2093
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2027
+#: nova/network/manager.py:2100
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4416,26 +4431,19 @@ msgstr ""
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:149
+#: nova/openstack/common/policy.py:394
 #, python-format
-msgid ""
-"Inheritance-based rules are deprecated; use the default brain instead of "
-"%s."
+msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:163
+#: nova/openstack/common/policy.py:404
 #, python-format
-msgid "Failed to understand rule %(match)r"
-msgstr ""
-
-#: nova/openstack/common/policy.py:173
-#, python-format
-msgid "Inheritance-based rules are deprecated; update _check_%s"
+msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: nova/openstack/common/policy.py:179
+#: nova/openstack/common/policy.py:679
 #, python-format
-msgid "No handler for matches of kind %s"
+msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
 #: nova/openstack/common/notifier/api.py:125
@@ -5061,19 +5069,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:844
+#: nova/tests/fakelibvirt.py:849
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:848
+#: nova/tests/fakelibvirt.py:853
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:852
+#: nova/tests/fakelibvirt.py:857
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:856
+#: nova/tests/fakelibvirt.py:861
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5156,12 +5164,12 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:686
+#: nova/tests/test_xenapi.py:691
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:697
+#: nova/tests/test_xenapi.py:702
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -5178,17 +5186,17 @@ msgstr ""
 msgid "unexpected role header"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2920
+#: nova/tests/api/openstack/compute/test_servers.py:2996
 msgid ""
 "Quota exceeded for instances: Requested 1, but already used 10 of 10 "
 "instances"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2925
+#: nova/tests/api/openstack/compute/test_servers.py:3001
 msgid "Quota exceeded for ram: Requested 4096, but already used 8192 of 10240 ram"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2930
+#: nova/tests/api/openstack/compute/test_servers.py:3006
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
@@ -5212,59 +5220,59 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:121
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:126
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:130
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:135
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:152
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:178
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:157
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:183
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:161
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:166
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:214
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:219
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:240
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:245
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:607
-#: nova/tests/compute/test_compute.py:625
-#: nova/tests/compute/test_compute.py:658
-#: nova/tests/compute/test_compute.py:683
-#: nova/tests/compute/test_compute.py:2306
+#: nova/tests/compute/test_compute.py:626
+#: nova/tests/compute/test_compute.py:644
+#: nova/tests/compute/test_compute.py:680
+#: nova/tests/compute/test_compute.py:705
+#: nova/tests/compute/test_compute.py:2341
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:613
-#: nova/tests/compute/test_compute.py:648
-#: nova/tests/compute/test_compute.py:671
-#: nova/tests/compute/test_compute.py:701
+#: nova/tests/compute/test_compute.py:632
+#: nova/tests/compute/test_compute.py:667
+#: nova/tests/compute/test_compute.py:693
+#: nova/tests/compute/test_compute.py:723
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1041
+#: nova/tests/compute/test_compute.py:1063
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2317
+#: nova/tests/compute/test_compute.py:2352
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -5377,7 +5385,7 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/virt/configdrive.py:71
+#: nova/virt/configdrive.py:76
 #, python-format
 msgid "Added %(filepath)s to config drive"
 msgstr ""
@@ -5404,16 +5412,16 @@ msgstr ""
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:91
+#: nova/virt/images.py:101
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:97
+#: nova/virt/images.py:107
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:108
+#: nova/virt/images.py:118
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -5609,7 +5617,7 @@ msgid "instance %s: finished toXML method"
 msgstr ""
 
 #: nova/virt/baremetal/driver.py:558 nova/virt/hyperv/vmops.py:486
-#: nova/virt/libvirt/driver.py:1979
+#: nova/virt/libvirt/driver.py:1986
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5624,7 +5632,7 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3023
+#: nova/virt/baremetal/driver.py:725 nova/virt/libvirt/driver.py:3030
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -6162,7 +6170,7 @@ msgstr ""
 msgid "Removing existing folder %s "
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:455
+#: nova/virt/hyperv/volumeops.py:69 nova/virt/xenapi/vm_utils.py:483
 #, python-format
 msgid "block device info: %s"
 msgstr ""
@@ -6187,7 +6195,7 @@ msgstr ""
 msgid "Attach volume failed: %s"
 msgstr "無法卸載 Volume %s"
 
-#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:194
+#: nova/virt/hyperv/volumeops.py:137 nova/virt/xenapi/volumeops.py:191
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
@@ -6222,7 +6230,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr "找不到Volume %s"
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:605
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:603
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6340,220 +6348,220 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1453
-#: nova/virt/xenapi/vm_utils.py:448
+#: nova/virt/hyperv/volumeutils.py:121 nova/virt/libvirt/driver.py:1462
+#: nova/virt/xenapi/vm_utils.py:476
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:334
+#: nova/virt/libvirt/driver.py:332
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:340
+#: nova/virt/libvirt/driver.py:338
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:361
+#: nova/virt/libvirt/driver.py:359
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:383 nova/virt/libvirt/driver.py:386
+#: nova/virt/libvirt/driver.py:381 nova/virt/libvirt/driver.py:384
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:468
+#: nova/virt/libvirt/driver.py:466
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:482
+#: nova/virt/libvirt/driver.py:480
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:487
+#: nova/virt/libvirt/driver.py:485
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:509
+#: nova/virt/libvirt/driver.py:507
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:524
+#: nova/virt/libvirt/driver.py:522
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:537
+#: nova/virt/libvirt/driver.py:535
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:554
+#: nova/virt/libvirt/driver.py:552
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:568
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:718
+#: nova/virt/libvirt/driver.py:728
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:728
+#: nova/virt/libvirt/driver.py:738
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:741
+#: nova/virt/libvirt/driver.py:751
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:868
+#: nova/virt/libvirt/driver.py:883
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:872
+#: nova/virt/libvirt/driver.py:887
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:904
+#: nova/virt/libvirt/driver.py:919
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:939
+#: nova/virt/libvirt/driver.py:954
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1069
+#: nova/virt/libvirt/driver.py:1084
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1076 nova/virt/powervm/operator.py:253
+#: nova/virt/libvirt/driver.py:1091 nova/virt/powervm/operator.py:253
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1092
+#: nova/virt/libvirt/driver.py:1107
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1138
+#: nova/virt/libvirt/driver.py:1153
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "使用者並沒有管理者權力"
 
-#: nova/virt/libvirt/driver.py:1182
+#: nova/virt/libvirt/driver.py:1197
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1186
+#: nova/virt/libvirt/driver.py:1201
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1190 nova/virt/libvirt/driver.py:1194
+#: nova/virt/libvirt/driver.py:1205 nova/virt/libvirt/driver.py:1209
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1248
-msgid "Using config drive"
+#: nova/virt/libvirt/driver.py:1275
+msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1267
-msgid "Creating image"
+#: nova/virt/libvirt/driver.py:1401
+msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1402
+#: nova/virt/libvirt/driver.py:1411
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1416
+#: nova/virt/libvirt/driver.py:1425
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1426
+#: nova/virt/libvirt/driver.py:1435
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1500
+#: nova/virt/libvirt/driver.py:1509
 #, 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:1506
+#: nova/virt/libvirt/driver.py:1515
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1510
+#: nova/virt/libvirt/driver.py:1519
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1514
+#: nova/virt/libvirt/driver.py:1523
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1530
+#: nova/virt/libvirt/driver.py:1539
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1824
+#: nova/virt/libvirt/driver.py:1831
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1828
+#: nova/virt/libvirt/driver.py:1835
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1845
+#: nova/virt/libvirt/driver.py:1852
 #, 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:2097
+#: nova/virt/libvirt/driver.py:2104
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2284
+#: nova/virt/libvirt/driver.py:2291
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2292
+#: nova/virt/libvirt/driver.py:2299
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2330
+#: nova/virt/libvirt/driver.py:2337
 #, 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:2350
+#: nova/virt/libvirt/driver.py:2357
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2362
+#: nova/virt/libvirt/driver.py:2369
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6563,51 +6571,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2379
+#: nova/virt/libvirt/driver.py:2386
 #, 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:2427
+#: nova/virt/libvirt/driver.py:2434
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2497
+#: nova/virt/libvirt/driver.py:2504
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2541
+#: nova/virt/libvirt/driver.py:2548
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2668
+#: nova/virt/libvirt/driver.py:2675
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2717
+#: nova/virt/libvirt/driver.py:2724
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2779
+#: nova/virt/libvirt/driver.py:2786
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2838
+#: nova/virt/libvirt/driver.py:2845
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2845
+#: nova/virt/libvirt/driver.py:2852
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2903
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6648,127 +6656,127 @@ msgstr ""
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:166
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:169
+#: nova/virt/libvirt/imagecache.py:167
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:169
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:184
+#: nova/virt/libvirt/imagecache.py:182
 #, 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:236
+#: nova/virt/libvirt/imagecache.py:234
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:246
+#: nova/virt/libvirt/imagecache.py:244
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:265
+#: nova/virt/libvirt/imagecache.py:263
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:277
+#: nova/virt/libvirt/imagecache.py:275
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:287
+#: nova/virt/libvirt/imagecache.py:285
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:298
+#: nova/virt/libvirt/imagecache.py:296
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:315
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:329
+#: nova/virt/libvirt/imagecache.py:327
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:337
+#: nova/virt/libvirt/imagecache.py:335
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:347
+#: nova/virt/libvirt/imagecache.py:345
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:353
+#: nova/virt/libvirt/imagecache.py:351
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:374
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:380
+#: nova/virt/libvirt/imagecache.py:378
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:385
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:405
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:410
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:413
+#: nova/virt/libvirt/imagecache.py:411
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:417
+#: nova/virt/libvirt/imagecache.py:415
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:425
+#: nova/virt/libvirt/imagecache.py:423
 msgid "Verification complete"
 msgstr ""
 
@@ -6797,31 +6805,31 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:424
+#: nova/virt/libvirt/utils.py:409
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:513
+#: nova/virt/libvirt/utils.py:498
 #, python-format
 msgid "Reading image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:517
+#: nova/virt/libvirt/utils.py:502
 #, python-format
 msgid "Read: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:523
+#: nova/virt/libvirt/utils.py:508
 #, python-format
 msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:547
+#: nova/virt/libvirt/utils.py:532
 #, python-format
 msgid "Writing image info file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:548
+#: nova/virt/libvirt/utils.py:533
 #, python-format
 msgid "Wrote: %s"
 msgstr ""
@@ -6841,19 +6849,19 @@ msgstr ""
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:164
+#: nova/virt/libvirt/volume.py:173
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:167
+#: nova/virt/libvirt/volume.py:176
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:179
+#: nova/virt/libvirt/volume.py:188
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -7425,150 +7433,166 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:73 nova/virt/xenapi/vmops.py:1430
+#: nova/virt/xenapi/agent.py:80 nova/virt/xenapi/vmops.py:1432
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:77 nova/virt/xenapi/vmops.py:1434
+#: nova/virt/xenapi/agent.py:84 nova/virt/xenapi/vmops.py:1436
 #, 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:82 nova/virt/xenapi/vmops.py:1439
+#: nova/virt/xenapi/agent.py:89 nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:92
+#: nova/virt/xenapi/agent.py:99
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:102
+#: nova/virt/xenapi/agent.py:109
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:114
+#: nova/virt/xenapi/agent.py:121
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:128
+#: nova/virt/xenapi/agent.py:135
 msgid "Reached maximum time attempting to query agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:137
+#: nova/virt/xenapi/agent.py:144
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:144
+#: nova/virt/xenapi/agent.py:151
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:159
+#: nova/virt/xenapi/agent.py:166
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:169
+#: nova/virt/xenapi/agent.py:176
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:188
+#: nova/virt/xenapi/agent.py:195
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:196
+#: nova/virt/xenapi/agent.py:203
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208
+#: nova/virt/xenapi/agent.py:215
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:216
+#: nova/virt/xenapi/agent.py:223
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:221
+#: nova/virt/xenapi/agent.py:228
 #, python-format
 msgid "Failed to reset network: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:275
+#: nova/virt/xenapi/agent.py:248
+msgid ""
+"XenServer tools installed in this image are capable of network injection."
+"  Networking files will not bemanipulated"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:256
+msgid ""
+"XenServer tools are present in this image but are not capable of network "
+"injection"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:260
+msgid "XenServer tools are not installed in this image"
+msgstr ""
+
+#: nova/virt/xenapi/agent.py:312
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:142
+#: nova/virt/xenapi/driver.py:135
 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:169
+#: nova/virt/xenapi/driver.py:162
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:362
+#: nova/virt/xenapi/driver.py:355
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:572
+#: nova/virt/xenapi/driver.py:565
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:624
+#: nova/virt/xenapi/driver.py:617
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:662
+#: nova/virt/xenapi/driver.py:655
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:746 nova/virt/xenapi/driver.py:760
+#: nova/virt/xenapi/driver.py:739 nova/virt/xenapi/driver.py:753
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:668 nova/virt/xenapi/fake.py:770
-#: nova/virt/xenapi/fake.py:789 nova/virt/xenapi/fake.py:857
+#: nova/virt/xenapi/fake.py:669 nova/virt/xenapi/fake.py:771
+#: nova/virt/xenapi/fake.py:790 nova/virt/xenapi/fake.py:858
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:670
+#: nova/virt/xenapi/fake.py:671
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:704
+#: nova/virt/xenapi/fake.py:705
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:709
+#: nova/virt/xenapi/fake.py:710
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:712
+#: nova/virt/xenapi/fake.py:713
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:772
+#: nova/virt/xenapi/fake.py:773
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -7670,423 +7694,411 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:256
+#: nova/virt/xenapi/vm_utils.py:257
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:268
+#: nova/virt/xenapi/vm_utils.py:269
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:280
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:311
+#: nova/virt/xenapi/vm_utils.py:312
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:328
+#: nova/virt/xenapi/vm_utils.py:329
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:331
+#: nova/virt/xenapi/vm_utils.py:332
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:336
+#: nova/virt/xenapi/vm_utils.py:337
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:341
+#: nova/virt/xenapi/vm_utils.py:342
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:352
+#: nova/virt/xenapi/vm_utils.py:353
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:371
+#: nova/virt/xenapi/vm_utils.py:372
 #, 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:374
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:385
+#: nova/virt/xenapi/vm_utils.py:391
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:417
+#: nova/virt/xenapi/vm_utils.py:423
 #, 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:528
+#: nova/virt/xenapi/vm_utils.py:454
+msgid "SR not present and could not be introduced"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:555
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:548
+#: nova/virt/xenapi/vm_utils.py:575
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:557
+#: nova/virt/xenapi/vm_utils.py:584
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:605
+#: nova/virt/xenapi/vm_utils.py:632
 #, python-format
 msgid "Destroying cached VDI '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:663
+#: nova/virt/xenapi/vm_utils.py:690
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:848
+#: nova/virt/xenapi/vm_utils.py:875
 #, 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 %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:906
+#: nova/virt/xenapi/vm_utils.py:933
 #, python-format
 msgid "Unrecognized cache_images value '%s', defaulting to True"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:940
+#: nova/virt/xenapi/vm_utils.py:967
 #, python-format
 msgid "Fetched VDIs of type '%(vdi_type)s' with UUID '%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:952
+#: nova/virt/xenapi/vm_utils.py:979
 #, 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:965
+#: nova/virt/xenapi/vm_utils.py:992
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1001
+#: nova/virt/xenapi/vm_utils.py:1028
 #, python-format
 msgid "Invalid value '%s' for xenapi_torrent_images"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1012
+#: nova/virt/xenapi/vm_utils.py:1039
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1076
+#: nova/virt/xenapi/vm_utils.py:1103
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1092
+#: nova/virt/xenapi/vm_utils.py:1119
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1096
+#: nova/virt/xenapi/vm_utils.py:1123
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1118
+#: nova/virt/xenapi/vm_utils.py:1145
 #, python-format
 msgid "Fetching image %(image_id)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1131
+#: nova/virt/xenapi/vm_utils.py:1158
 #, python-format
 msgid "Size for image %(image_id)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1140
+#: nova/virt/xenapi/vm_utils.py:1167
 #, 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:1159
+#: nova/virt/xenapi/vm_utils.py:1186
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1200
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1182
+#: nova/virt/xenapi/vm_utils.py:1209
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1220
+#: nova/virt/xenapi/vm_utils.py:1247
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1241
+#: nova/virt/xenapi/vm_utils.py:1268
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1259
+#: nova/virt/xenapi/vm_utils.py:1286
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1290
+#: nova/virt/xenapi/vm_utils.py:1317
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1386
+#: nova/virt/xenapi/vm_utils.py:1413
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1413
+#: nova/virt/xenapi/vm_utils.py:1440
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1441
+#: nova/virt/xenapi/vm_utils.py:1468
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1459
+#: nova/virt/xenapi/vm_utils.py:1486
 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:1472
+#: nova/virt/xenapi/vm_utils.py:1499
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1480
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1509
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1485
+#: nova/virt/xenapi/vm_utils.py:1512
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1488
+#: nova/virt/xenapi/vm_utils.py:1515
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
+#: nova/virt/xenapi/vm_utils.py:1519
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1494
+#: nova/virt/xenapi/vm_utils.py:1521
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1497
+#: nova/virt/xenapi/vm_utils.py:1524
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1500
+#: nova/virt/xenapi/vm_utils.py:1527
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1503
+#: nova/virt/xenapi/vm_utils.py:1530
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1525
+#: nova/virt/xenapi/vm_utils.py:1552
 #, 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:1541
+#: nova/virt/xenapi/vm_utils.py:1568
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1622
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1655
+#: nova/virt/xenapi/vm_utils.py:1682
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1742
+#: nova/virt/xenapi/vm_utils.py:1769
 #, 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:1752
+#: nova/virt/xenapi/vm_utils.py:1779
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1787
+#: nova/virt/xenapi/vm_utils.py:1814
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1807
+#: nova/virt/xenapi/vm_utils.py:1834
 #, python-format
 msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1820
+#: nova/virt/xenapi/vm_utils.py:1847
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1823
+#: nova/virt/xenapi/vm_utils.py:1850
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1825
+#: nova/virt/xenapi/vm_utils.py:1852
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1828
+#: nova/virt/xenapi/vm_utils.py:1855
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1833
+#: nova/virt/xenapi/vm_utils.py:1860
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1841
+#: nova/virt/xenapi/vm_utils.py:1868
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1854
+#: nova/virt/xenapi/vm_utils.py:1881
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1861
+#: nova/virt/xenapi/vm_utils.py:1888
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1863
+#: nova/virt/xenapi/vm_utils.py:1890
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1876
+#: nova/virt/xenapi/vm_utils.py:1903
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1882
+#: nova/virt/xenapi/vm_utils.py:1909
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1907
+#: nova/virt/xenapi/vm_utils.py:1934
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1920
+#: nova/virt/xenapi/vm_utils.py:1947
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1974
+#: nova/virt/xenapi/vm_utils.py:2001
 #, 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:2006
+#: nova/virt/xenapi/vm_utils.py:2033
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2056
-msgid ""
-"XenServer tools installed in this image are capable of network injection."
-"  Networking files will not bemanipulated"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2064
-msgid ""
-"XenServer tools are present in this image but are not capable of network "
-"injection"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2068
-msgid "XenServer tools are not installed in this image"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:2084
+#: nova/virt/xenapi/vm_utils.py:2082
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2093
+#: nova/virt/xenapi/vm_utils.py:2091
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:2205
+#: nova/virt/xenapi/vm_utils.py:2203
 msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:126 nova/virt/xenapi/vmops.py:638
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
@@ -8095,181 +8107,181 @@ msgstr ""
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:297
+#: nova/virt/xenapi/vmops.py:298
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:357
+#: nova/virt/xenapi/vmops.py:358
 #, python-format
 msgid "Block device information present: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:380
+#: nova/virt/xenapi/vmops.py:381
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:444
+#: nova/virt/xenapi/vmops.py:445
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:461
+#: nova/virt/xenapi/vmops.py:462
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:486
+#: nova/virt/xenapi/vmops.py:488
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:493
+#: nova/virt/xenapi/vmops.py:495
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:496
+#: nova/virt/xenapi/vmops.py:498
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:503
+#: nova/virt/xenapi/vmops.py:505
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:517
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:547
+#: nova/virt/xenapi/vmops.py:549
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:605
+#: nova/virt/xenapi/vmops.py:607
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:609
+#: nova/virt/xenapi/vmops.py:611
 #, python-format
 msgid "Migrating VHD '%(vdi_uuid)s' with seq_num %(seq_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:617
+#: nova/virt/xenapi/vmops.py:619
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:653
+#: nova/virt/xenapi/vmops.py:655
 #, python-format
 msgid "Resizing down VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:777
+#: nova/virt/xenapi/vmops.py:779
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:782
+#: nova/virt/xenapi/vmops.py:784
 msgid "Resize complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:826
+#: nova/virt/xenapi/vmops.py:828
 msgid "Starting halted instance found during reboot"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:909
+#: nova/virt/xenapi/vmops.py:911
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:936
+#: nova/virt/xenapi/vmops.py:938
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:964
+#: nova/virt/xenapi/vmops.py:966
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:971
+#: nova/virt/xenapi/vmops.py:973
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:978
+#: nova/virt/xenapi/vmops.py:980
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1004
+#: nova/virt/xenapi/vmops.py:1006
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1030
+#: nova/virt/xenapi/vmops.py:1032
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1083
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1116
+#: nova/virt/xenapi/vmops.py:1118
 msgid "VM is not present, skipping power off..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1152
+#: nova/virt/xenapi/vmops.py:1154
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1156
+#: nova/virt/xenapi/vmops.py:1158
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1255
+#: nova/virt/xenapi/vmops.py:1257
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1338
+#: nova/virt/xenapi/vmops.py:1340
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1357
+#: nova/virt/xenapi/vmops.py:1359
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1366
+#: nova/virt/xenapi/vmops.py:1368
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1369
+#: nova/virt/xenapi/vmops.py:1371
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1393
+#: nova/virt/xenapi/vmops.py:1395
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1489
+#: nova/virt/xenapi/vmops.py:1491
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1521
+#: nova/virt/xenapi/vmops.py:1523
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1569
+#: nova/virt/xenapi/vmops.py:1571
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1605
+#: nova/virt/xenapi/vmops.py:1607
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -8301,7 +8313,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:92 nova/virt/xenapi/volume_utils.py:159
-#: nova/virt/xenapi/volumeops.py:150
+#: nova/virt/xenapi/volumeops.py:151
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -8314,7 +8326,7 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:154
+#: nova/virt/xenapi/volume_utils.py:105 nova/virt/xenapi/volumeops.py:155
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
@@ -8376,12 +8388,17 @@ msgstr ""
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:304
+#: nova/virt/xenapi/volume_utils.py:281
+#, python-format
+msgid "Unable to obtain target information %(mountpoint)s"
+msgstr ""
+
+#: nova/virt/xenapi/volume_utils.py:309
 #, python-format
-msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+msgid "Unable to obtain target information %(connection_data)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:330
+#: nova/virt/xenapi/volume_utils.py:335
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
@@ -8430,47 +8447,47 @@ msgstr ""
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:172
+#: nova/virt/xenapi/volumeops.py:173
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "無法替 instance實例 %(instance_name)s , 建立 VDI 在SR %(sr_ref)s"
 
-#: nova/virt/xenapi/volumeops.py:182
+#: nova/virt/xenapi/volumeops.py:183
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "無法替 instance實例 %(instance_name)s ,  使用SR %(sr_ref)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:207
+#: nova/virt/xenapi/volumeops.py:204
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:215
+#: nova/virt/xenapi/volumeops.py:212
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "找不到Volume %s"
 
-#: nova/virt/xenapi/volumeops.py:224
+#: nova/virt/xenapi/volumeops.py:221
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "無法卸載 Volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:226
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:236
+#: nova/virt/xenapi/volumeops.py:233
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:238
+#: nova/virt/xenapi/volumeops.py:235
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 從虛擬機器 %(instance_name)s 卸載"
@@ -9031,52 +9048,52 @@ msgstr ""
 msgid "Trying to delete non-existing volume %(volume)s at path %(mounted_path)s"
 msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:154
+#: nova/volume/san.py:116 nova/volume/san.py:156
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:158
+#: nova/volume/san.py:160
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:228
+#: nova/volume/san.py:230
 #, python-format
 msgid "Cannot parse list-view output: %s"
 msgstr ""
 
-#: nova/volume/san.py:322
+#: nova/volume/san.py:324
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:455
+#: nova/volume/san.py:457
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:461
+#: nova/volume/san.py:463
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:469
+#: nova/volume/san.py:471
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:499
+#: nova/volume/san.py:501
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:552
+#: nova/volume/san.py:554
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:608
+#: nova/volume/san.py:610
 msgid "local_path not supported"
 msgstr ""
 
@@ -9850,3 +9867,36 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid ""
+#~ "The root_helper option (which lets you"
+#~ " specify a root wrapper different "
+#~ "from nova-rootwrap, and defaults to "
+#~ "using sudo) is now deprecated. You "
+#~ "should use the rootwrap_config option "
+#~ "instead."
+#~ msgstr ""
+
+#~ msgid "backend %s"
+#~ msgstr ""
+
+#~ msgid "Invalid server status: %(status)s"
+#~ msgstr ""
+
+#~ msgid "Use of empty request context is deprecated"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Inheritance-based rules are deprecated; "
+#~ "use the default brain instead of "
+#~ "%s."
+#~ msgstr ""
+
+#~ msgid "Failed to understand rule %(match)r"
+#~ msgstr ""
+
+#~ msgid "Inheritance-based rules are deprecated; update _check_%s"
+#~ msgstr ""
+
+#~ msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
+#~ msgstr ""
+