Merge "Imported Translations from Transifex"

1 files changed, 486 insertions, 468 deletions

diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index ccd7d5735..c7ae518b7 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-11-27 00:02+0000\n"
+"POT-Creation-Date: 2012-11-29 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"
@@ -145,8 +145,8 @@ msgstr ""
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:225 nova/api/ec2/cloud.py:398 nova/api/ec2/cloud.py:423
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2280
+#: nova/exception.py:225 nova/api/ec2/cloud.py:416 nova/api/ec2/cloud.py:441
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2287
 msgid "Keypair data is invalid"
 msgstr ""
 
@@ -176,7 +176,7 @@ msgstr ""
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:253 nova/api/ec2/cloud.py:580
+#: nova/exception.py:253 nova/api/ec2/cloud.py:598
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
@@ -764,325 +764,330 @@ msgstr ""
 
 #: nova/exception.py:757
 #, python-format
-msgid "Scheduler Host Filter %(filter_name)s could not be found."
+msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
 #: nova/exception.py:761
 #, python-format
+msgid "Scheduler Host Filter %(filter_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:765
+#, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:766
+#: nova/exception.py:770
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:770
+#: nova/exception.py:774
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:779
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:784
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:785
+#: nova/exception.py:789
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:789
+#: nova/exception.py:793
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:793
+#: nova/exception.py:797
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:798
+#: nova/exception.py:802
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:802
+#: nova/exception.py:806
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:810
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:810
+#: nova/exception.py:814
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:814
+#: nova/exception.py:818
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:818
+#: nova/exception.py:822
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:822
+#: nova/exception.py:826
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:826
+#: nova/exception.py:830
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:830
+#: nova/exception.py:834
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:834
+#: nova/exception.py:838
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:839
+#: nova/exception.py:843
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:843
+#: nova/exception.py:847
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:847
+#: nova/exception.py:851
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:851
+#: nova/exception.py:855
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:861
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:865
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:869
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:873
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:877
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:881
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:885
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:889
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:893
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:897
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:901
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:905
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:908
+#: nova/exception.py:912
 #, 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:913
+#: nova/exception.py:917
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:921
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:925
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:929
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:929
+#: nova/exception.py:933
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:933
+#: nova/exception.py:937
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:937
+#: nova/exception.py:941
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:941
+#: nova/exception.py:945
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:950
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:954
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:958
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:962
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:963
+#: nova/exception.py:967
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:967
+#: nova/exception.py:971
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:975
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:977
+#: nova/exception.py:981
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:981
+#: nova/exception.py:985
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:985
+#: nova/exception.py:989
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:989
+#: nova/exception.py:993
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:993
+#: nova/exception.py:997
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:997
+#: nova/exception.py:1001
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1001
+#: nova/exception.py:1005
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1009
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1013
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1014
+#: nova/exception.py:1018
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1019
+#: nova/exception.py:1023
 #, 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:1025
+#: nova/exception.py:1029
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1033
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1034
+#: nova/exception.py:1038
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1042
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
@@ -1221,89 +1226,89 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:172
+#: nova/utils.py:174
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:183
+#: nova/utils.py:185
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:207 nova/utils.py:285 nova/virt/powervm/common.py:82
+#: nova/utils.py:209 nova/utils.py:287 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:222
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:260
+#: nova/utils.py:262
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:262
+#: nova/utils.py:264
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:266
+#: nova/utils.py:268
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:301
+#: nova/utils.py:303
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:460
+#: nova/utils.py:462
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:463
+#: nova/utils.py:465
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:498
+#: nova/utils.py:500
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:559
+#: nova/utils.py:561
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:619
+#: nova/utils.py:621
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:748
+#: nova/utils.py:750
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:777
+#: nova/utils.py:779
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:901
+#: nova/utils.py:903
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:979
+#: nova/utils.py:980
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1089 nova/virt/configdrive.py:154
+#: nova/utils.py:1090 nova/virt/configdrive.py:154
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1483,241 +1488,241 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:346
+#: nova/api/ec2/cloud.py:364
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:390
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:388
+#: nova/api/ec2/cloud.py:406
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:395 nova/api/ec2/cloud.py:420
+#: nova/api/ec2/cloud.py:413 nova/api/ec2/cloud.py:438
 #: nova/api/openstack/compute/contrib/keypairs.py:93
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:401 nova/api/ec2/cloud.py:426
+#: nova/api/ec2/cloud.py:419 nova/api/ec2/cloud.py:444
 #: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:410
+#: nova/api/ec2/cloud.py:428
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:433
+#: nova/api/ec2/cloud.py:451
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:567 nova/api/ec2/cloud.py:688
+#: nova/api/ec2/cloud.py:585 nova/api/ec2/cloud.py:706
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:572
+#: nova/api/ec2/cloud.py:590
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:610 nova/api/ec2/cloud.py:642
+#: nova/api/ec2/cloud.py:628 nova/api/ec2/cloud.py:660
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:633
+#: nova/api/ec2/cloud.py:651
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:699
+#: nova/api/ec2/cloud.py:717
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:775
+#: nova/api/ec2/cloud.py:793
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:779 nova/api/openstack/compute/contrib/volumes.py:240
+#: nova/api/ec2/cloud.py:797 nova/api/openstack/compute/contrib/volumes.py:240
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:807
+#: nova/api/ec2/cloud.py:825
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:820
+#: nova/api/ec2/cloud.py:838
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:828
+#: nova/api/ec2/cloud.py:846
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841 nova/api/openstack/compute/contrib/volumes.py:419
+#: nova/api/ec2/cloud.py:859 nova/api/openstack/compute/contrib/volumes.py:419
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:847
+#: nova/api/ec2/cloud.py:865
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/ec2/cloud.py:930
-#: nova/api/ec2/cloud.py:1466 nova/api/ec2/cloud.py:1481
+#: nova/api/ec2/cloud.py:891 nova/api/ec2/cloud.py:948
+#: nova/api/ec2/cloud.py:1484 nova/api/ec2/cloud.py:1499
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995
+#: nova/api/ec2/cloud.py:1013
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1146
+#: nova/api/ec2/cloud.py:1164
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1150
+#: nova/api/ec2/cloud.py:1168
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1154
+#: nova/api/ec2/cloud.py:1172
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1159
+#: nova/api/ec2/cloud.py:1177
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1162
+#: nova/api/ec2/cloud.py:1180
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1170
+#: nova/api/ec2/cloud.py:1188
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1178
+#: nova/api/ec2/cloud.py:1196
 #: nova/api/openstack/compute/contrib/floating_ips.py:257
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1187
+#: nova/api/ec2/cloud.py:1205
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1190
+#: nova/api/ec2/cloud.py:1208
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1193
+#: nova/api/ec2/cloud.py:1211
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1201
+#: nova/api/ec2/cloud.py:1219
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1206
+#: nova/api/ec2/cloud.py:1224
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1209
+#: nova/api/ec2/cloud.py:1227
 #: nova/api/openstack/compute/contrib/floating_ips.py:100
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1236
+#: nova/api/ec2/cloud.py:1254
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1268
+#: nova/api/ec2/cloud.py:1286
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1278
+#: nova/api/ec2/cloud.py:1296
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1305
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1296
+#: nova/api/ec2/cloud.py:1314
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1387
+#: nova/api/ec2/cloud.py:1405
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1421
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1422
+#: nova/api/ec2/cloud.py:1440
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1484
+#: nova/api/ec2/cloud.py:1502
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1486
+#: nova/api/ec2/cloud.py:1504
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1506
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1508
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1503
+#: nova/api/ec2/cloud.py:1521
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1532
+#: nova/api/ec2/cloud.py:1550
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1562
+#: nova/api/ec2/cloud.py:1580
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1580
+#: nova/api/ec2/cloud.py:1598
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1613
+#: nova/api/ec2/cloud.py:1631
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2259,7 +2264,7 @@ msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1177
-#: nova/api/openstack/compute/contrib/aggregates.py:142
+#: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 #: nova/api/openstack/compute/contrib/networks.py:72
 msgid "Invalid request body"
@@ -2379,46 +2384,39 @@ msgstr ""
 msgid "Compute.api::resetState %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:76
-#, python-format
-msgid ""
-"Cannot create aggregate with name %(name)s and availability zone "
-"%(avail_zone)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/aggregates.py:88
+#: nova/api/openstack/compute/contrib/aggregates.py:89
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:114
+#: nova/api/openstack/compute/contrib/aggregates.py:115
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:126
+#: nova/api/openstack/compute/contrib/aggregates.py:127
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:139
+#: nova/api/openstack/compute/contrib/aggregates.py:140
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:152
-#: nova/api/openstack/compute/contrib/aggregates.py:157
+#: nova/api/openstack/compute/contrib/aggregates.py:153
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:170
-#: nova/api/openstack/compute/contrib/aggregates.py:174
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:194
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2894,78 +2892,78 @@ msgstr ""
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2253
+#: nova/compute/api.py:2260
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2257
+#: nova/compute/api.py:2264
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2358
+#: nova/compute/api.py:2365
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2361
+#: nova/compute/api.py:2368
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2369
+#: nova/compute/api.py:2376
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2375
+#: nova/compute/api.py:2382
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2395
+#: nova/compute/api.py:2402
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2398
+#: nova/compute/api.py:2405
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2405
+#: nova/compute/api.py:2412
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2470
+#: nova/compute/api.py:2477
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2478
+#: nova/compute/api.py:2485
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2481
+#: nova/compute/api.py:2488
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:2738
+#: nova/compute/api.py:2745
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:2747
+#: nova/compute/api.py:2754
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:2750
+#: nova/compute/api.py:2757
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:2761
+#: nova/compute/api.py:2768
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
@@ -3028,513 +3026,523 @@ msgstr ""
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:74 nova/compute/instance_types.py:82
-msgid "create arguments must be positive integers"
+#: nova/compute/instance_types.py:74
+#, python-format
+msgid "'%s' argument must be a positive integer"
+msgstr ""
+
+#: nova/compute/instance_types.py:82
+msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/instance_types.py:92
+#: nova/compute/instance_types.py:90
+#, python-format
+msgid "'%s' argument must be greater than 0"
+msgstr ""
+
+#: nova/compute/instance_types.py:100
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/instance_types.py:99
+#: nova/compute/instance_types.py:107
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:109
+#: nova/compute/instance_types.py:117
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:206
+#: nova/compute/manager.py:200
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:358
+#: nova/compute/manager.py:352
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:386
+#: nova/compute/manager.py:380
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:400
+#: nova/compute/manager.py:394
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:414
+#: nova/compute/manager.py:408
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:424
+#: nova/compute/manager.py:418
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:443
+#: nova/compute/manager.py:437
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:519
+#: nova/compute/manager.py:513
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:591
+#: nova/compute/manager.py:585 nova/compute/manager.py:1807
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:614
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:643
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:676 nova/compute/manager.py:1859
+#: nova/compute/manager.py:670 nova/compute/manager.py:1858
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:693
+#: nova/compute/manager.py:687
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:692
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:704
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:727
+#: nova/compute/manager.py:721
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:757
+#: nova/compute/manager.py:751
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:794
 #, 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:806
+#: nova/compute/manager.py:800
 #, 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:816
+#: nova/compute/manager.py:810
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:837
+#: nova/compute/manager.py:831
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:841
+#: nova/compute/manager.py:835
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:854
+#: nova/compute/manager.py:848
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:872
+#: nova/compute/manager.py:866
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:896
+#: nova/compute/manager.py:890
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:968
+#: nova/compute/manager.py:962
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:999
+#: nova/compute/manager.py:993
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:996
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1009
+#: nova/compute/manager.py:1003
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1033
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1073 nova/compute/manager.py:2030
-#: nova/compute/manager.py:3228
+#: nova/compute/manager.py:1067 nova/compute/manager.py:2027
+#: nova/compute/manager.py:3226
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1201
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1290
+#: nova/compute/manager.py:1284
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1314
+#: nova/compute/manager.py:1308
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1323
+#: nova/compute/manager.py:1317
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1360
+#: nova/compute/manager.py:1354
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1366
+#: nova/compute/manager.py:1360
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1419
+#: nova/compute/manager.py:1413
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1426
+#: nova/compute/manager.py:1420
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1431
+#: nova/compute/manager.py:1425
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1462
+#: nova/compute/manager.py:1456
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1469
+#: nova/compute/manager.py:1463
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1479
+#: nova/compute/manager.py:1473
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1495
+#: nova/compute/manager.py:1489
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1503
+#: nova/compute/manager.py:1497
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1518
+#: nova/compute/manager.py:1512
 #, 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:1522
+#: nova/compute/manager.py:1516
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1543
+#: nova/compute/manager.py:1537
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:1556
+#: nova/compute/manager.py:1550
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1587
+#: nova/compute/manager.py:1581
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1608
+#: nova/compute/manager.py:1602
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1780
+#: nova/compute/manager.py:1774
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:1786
+#: nova/compute/manager.py:1780
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1795
+#: nova/compute/manager.py:1789
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2027
+#: nova/compute/manager.py:2024
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2080
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2100
+#: nova/compute/manager.py:2097
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2138
+#: nova/compute/manager.py:2135
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2168
+#: nova/compute/manager.py:2165
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2190
+#: nova/compute/manager.py:2187
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2195
+#: nova/compute/manager.py:2192
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2198
+#: nova/compute/manager.py:2195
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2215
+#: nova/compute/manager.py:2212
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2240
+#: nova/compute/manager.py:2237
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2268
+#: nova/compute/manager.py:2265
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2312
+#: nova/compute/manager.py:2309
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2321
+#: nova/compute/manager.py:2318
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2336
+#: nova/compute/manager.py:2333
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2365
+#: nova/compute/manager.py:2362
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2369
+#: nova/compute/manager.py:2366
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2382
+#: nova/compute/manager.py:2379
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2426
+#: nova/compute/manager.py:2423
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2486
+#: nova/compute/manager.py:2483
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2546
+#: nova/compute/manager.py:2543
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2572
+#: nova/compute/manager.py:2569
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2621
+#: nova/compute/manager.py:2618
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2623
+#: nova/compute/manager.py:2620
 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:2637
+#: nova/compute/manager.py:2634
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2771
+#: nova/compute/manager.py:2768
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2800
+#: nova/compute/manager.py:2797
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2805
+#: nova/compute/manager.py:2803
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2814
+#: nova/compute/manager.py:2812
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2821
+#: nova/compute/manager.py:2819
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2825
+#: nova/compute/manager.py:2823
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2832
+#: nova/compute/manager.py:2830
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2840
+#: nova/compute/manager.py:2838
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2857
+#: nova/compute/manager.py:2855
 #, 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:2875
+#: nova/compute/manager.py:2873
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2898
+#: nova/compute/manager.py:2896
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2964
+#: nova/compute/manager.py:2962
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2992
+#: nova/compute/manager.py:2990
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2998 nova/compute/manager.py:3036
+#: nova/compute/manager.py:2996 nova/compute/manager.py:3034
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3023
+#: nova/compute/manager.py:3021
 #, 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:3060
+#: nova/compute/manager.py:3058
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3072 nova/compute/manager.py:3083
-#: nova/compute/manager.py:3097
+#: nova/compute/manager.py:3070 nova/compute/manager.py:3081
+#: nova/compute/manager.py:3095
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3077
+#: nova/compute/manager.py:3075
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3090
+#: nova/compute/manager.py:3088
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3106
+#: nova/compute/manager.py:3104
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3114
+#: nova/compute/manager.py:3112
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:3127
+#: nova/compute/manager.py:3125
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:3182
+#: nova/compute/manager.py:3180
 #, 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:3189
+#: nova/compute/manager.py:3187
 #, 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:3196
+#: nova/compute/manager.py:3194
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
@@ -3551,79 +3559,79 @@ msgid ""
 " claimed."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:240
+#: nova/compute/resource_tracker.py:242
 msgid "Auditing locally available compute resources"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:244
+#: nova/compute/resource_tracker.py:246
 msgid ""
 "Virt driver does not support 'get_available_resource'  Compute tracking "
 "is disabled."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:289
+#: nova/compute/resource_tracker.py:292
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/compute/resource_tracker.py:294
+#: nova/compute/resource_tracker.py:297
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/compute/resource_tracker.py:307
+#: nova/compute/resource_tracker.py:310
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:317
+#: nova/compute/resource_tracker.py:320
 #, python-format
 msgid "Hypervisor: free ram (MB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:318
+#: nova/compute/resource_tracker.py:321
 #, python-format
 msgid "Hypervisor: free disk (GB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:323
+#: nova/compute/resource_tracker.py:326
 #, python-format
 msgid "Hypervisor: free VCPUs: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:325
+#: nova/compute/resource_tracker.py:328
 msgid "Hypervisor: VCPU information unavailable"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:332
+#: nova/compute/resource_tracker.py:335
 #, python-format
 msgid "Free ram (MB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:333
+#: nova/compute/resource_tracker.py:336
 #, python-format
 msgid "Free disk (GB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:338
+#: nova/compute/resource_tracker.py:341
 #, python-format
 msgid "Free VCPUS: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:340
+#: nova/compute/resource_tracker.py:343
 msgid "Free VCPU information unavailable"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:378
+#: nova/compute/resource_tracker.py:381
 #, python-format
 msgid "Updating from migration %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:434
+#: nova/compute/resource_tracker.py:439
 msgid "Instance not resizing, skipping migration."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:502
+#: nova/compute/resource_tracker.py:507
 #, python-format
 msgid "Missing keys: %s"
 msgstr ""
@@ -3701,7 +3709,7 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:183 nova/virt/baremetal/db/sqlalchemy/api.py:67
+#: nova/db/sqlalchemy/api.py:183 nova/virt/baremetal/db/sqlalchemy/api.py:68
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
@@ -3713,7 +3721,7 @@ msgid ""
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2721
+#: nova/db/sqlalchemy/api.py:2730
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
@@ -3914,109 +3922,109 @@ msgstr ""
 msgid "Error clearing stale veth %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1135
+#: nova/network/linux_net.py:1139
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1174
+#: nova/network/linux_net.py:1178
 #, python-format
 msgid "Starting Bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1186
+#: nova/network/linux_net.py:1190
 #, python-format
 msgid "Adding interface %(interface)s to bridge %(bridge)s"
 msgstr ""
 
-#: nova/network/linux_net.py:1219
+#: nova/network/linux_net.py:1223
 #, python-format
 msgid "Failed to add interface: %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1321
+#: nova/network/linux_net.py:1360
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1329
+#: nova/network/linux_net.py:1368
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1348
+#: nova/network/linux_net.py:1387
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1350
+#: nova/network/linux_net.py:1389
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:298
+#: nova/network/manager.py:302
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:307 nova/network/manager.py:566
+#: nova/network/manager.py:311 nova/network/manager.py:571
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:322
+#: nova/network/manager.py:326
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:386
+#: nova/network/manager.py:390
 msgid "Floating IP is not associated. Ignore."
 msgstr ""
 
-#: nova/network/manager.py:404
+#: nova/network/manager.py:408
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:408
+#: nova/network/manager.py:412
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:429
+#: nova/network/manager.py:433
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate floating IP"
 msgstr ""
 
-#: nova/network/manager.py:490
+#: nova/network/manager.py:494
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/manager.py:689
+#: nova/network/manager.py:700
 #, python-format
 msgid "Starting migration network for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/network/manager.py:696
+#: nova/network/manager.py:707
 #, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notmigrate it "
 msgstr ""
 
-#: nova/network/manager.py:726
+#: nova/network/manager.py:737
 #, python-format
 msgid "Finishing migration network for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/network/manager.py:734
+#: nova/network/manager.py:745
 #, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notsetup it."
 msgstr ""
 
-#: nova/network/manager.py:781
+#: nova/network/manager.py:792
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4024,39 +4032,39 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:827
+#: nova/network/manager.py:838
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:837
+#: nova/network/manager.py:848
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:952
+#: nova/network/manager.py:963
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:956
+#: nova/network/manager.py:967
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:1083
+#: nova/network/manager.py:1094
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:1088
+#: nova/network/manager.py:1099
 #, python-format
 msgid "networks retrieved for instance: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:1118
+#: nova/network/manager.py:1129
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:1345
+#: nova/network/manager.py:1356
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4064,89 +4072,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:1434
+#: nova/network/manager.py:1445
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1451
+#: nova/network/manager.py:1462
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1455
+#: nova/network/manager.py:1466
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1463
+#: nova/network/manager.py:1474
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1468
+#: nova/network/manager.py:1479
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1472
+#: nova/network/manager.py:1483
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1475
+#: nova/network/manager.py:1486
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1494
+#: nova/network/manager.py:1505
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:1518
+#: nova/network/manager.py:1529
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:1538
+#: nova/network/manager.py:1549
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1619
+#: nova/network/manager.py:1630
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1622
+#: nova/network/manager.py:1633
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1633
+#: nova/network/manager.py:1644
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1690
+#: nova/network/manager.py:1701
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1721
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:2180
+#: nova/network/manager.py:2191
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:2187
+#: nova/network/manager.py:2198
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4635,25 +4643,15 @@ msgstr ""
 msgid "Setting instance to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:109
-#, python-format
-msgid "Casted '%(method)s' to compute '%(host)s'"
-msgstr ""
-
-#: nova/scheduler/driver.py:124
-#, python-format
-msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
-msgstr ""
-
-#: nova/scheduler/driver.py:173
+#: nova/scheduler/driver.py:144
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:152
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:313
+#: nova/scheduler/driver.py:284
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4665,23 +4663,23 @@ msgstr ""
 msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:188
+#: nova/scheduler/filter_scheduler.py:189
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:215
+#: nova/scheduler/filter_scheduler.py:216
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:269
+#: nova/scheduler/filter_scheduler.py:270
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:274
+#: nova/scheduler/filter_scheduler.py:275
 #, python-format
 msgid "Choosing host %(best_host)s"
 msgstr ""
@@ -5297,6 +5295,26 @@ msgstr ""
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
+#: nova/virt/baremetal/db/sqlalchemy/api.py:260
+msgid "No more PXE IPs available"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:282
+#: nova/virt/baremetal/db/sqlalchemy/api.py:323
+#, python-format
+msgid "Baremetal interface %s not found"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:333
+#, python-format
+msgid "Baremetal interface %s already in use"
+msgstr ""
+
+#: nova/virt/baremetal/db/sqlalchemy/api.py:347
+#, python-format
+msgid "Baremetal virtual interface %s not found"
+msgstr ""
+
 #: nova/virt/disk/api.py:220
 msgid "image already mounted"
 msgstr ""
@@ -5657,7 +5675,7 @@ msgstr ""
 msgid "get_console_output called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:78 nova/virt/libvirt/driver.py:2007
+#: nova/virt/hyperv/hostops.py:78 nova/virt/libvirt/driver.py:2010
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5672,7 +5690,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:163 nova/virt/libvirt/driver.py:3055
+#: nova/virt/hyperv/hostops.py:163 nova/virt/libvirt/driver.py:3058
 #: nova/virt/xenapi/host.py:150
 msgid "Updating host stats"
 msgstr ""
@@ -5856,11 +5874,11 @@ msgstr ""
 msgid "Invalid config_drive_format \"%s\""
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:183 nova/virt/libvirt/driver.py:1424
+#: nova/virt/hyperv/vmops.py:183 nova/virt/libvirt/driver.py:1427
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:194 nova/virt/libvirt/driver.py:1434
+#: nova/virt/hyperv/vmops.py:194 nova/virt/libvirt/driver.py:1437
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
@@ -6112,7 +6130,7 @@ msgstr ""
 msgid "Failed to remove volume from VM %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:607
+#: nova/virt/hyperv/volumeops.py:207 nova/virt/libvirt/driver.py:610
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -6230,215 +6248,215 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/volumeutils.py:122 nova/virt/libvirt/driver.py:1485
+#: nova/virt/hyperv/volumeutils.py:122 nova/virt/libvirt/driver.py:1488
 #: nova/virt/xenapi/vm_utils.py:505
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:336
+#: nova/virt/libvirt/driver.py:339
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:342
+#: nova/virt/libvirt/driver.py:345
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:363
+#: nova/virt/libvirt/driver.py:366
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:385 nova/virt/libvirt/driver.py:388
+#: nova/virt/libvirt/driver.py:388 nova/virt/libvirt/driver.py:391
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:470
+#: nova/virt/libvirt/driver.py:473
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:484
+#: nova/virt/libvirt/driver.py:487
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:489
+#: nova/virt/libvirt/driver.py:492
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:511
+#: nova/virt/libvirt/driver.py:514
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:526
+#: nova/virt/libvirt/driver.py:529
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:539
+#: nova/virt/libvirt/driver.py:542
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:556
+#: nova/virt/libvirt/driver.py:559
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:570
+#: nova/virt/libvirt/driver.py:573
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:730
+#: nova/virt/libvirt/driver.py:733
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:740
+#: nova/virt/libvirt/driver.py:743
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:760
+#: nova/virt/libvirt/driver.py:763
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:892
+#: nova/virt/libvirt/driver.py:895
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:896
+#: nova/virt/libvirt/driver.py:899
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:928
+#: nova/virt/libvirt/driver.py:931
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:964
+#: nova/virt/libvirt/driver.py:967
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1096
+#: nova/virt/libvirt/driver.py:1099
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1103 nova/virt/powervm/operator.py:256
+#: nova/virt/libvirt/driver.py:1106 nova/virt/powervm/operator.py:256
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1119
+#: nova/virt/libvirt/driver.py:1122
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1157 nova/virt/libvirt/driver.py:1183
+#: nova/virt/libvirt/driver.py:1160 nova/virt/libvirt/driver.py:1186
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1172
+#: nova/virt/libvirt/driver.py:1175
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1221
+#: nova/virt/libvirt/driver.py:1224
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1225
+#: nova/virt/libvirt/driver.py:1228
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1229 nova/virt/libvirt/driver.py:1233
+#: nova/virt/libvirt/driver.py:1232 nova/virt/libvirt/driver.py:1236
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1299
+#: nova/virt/libvirt/driver.py:1302
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1448
+#: nova/virt/libvirt/driver.py:1451
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1458
+#: nova/virt/libvirt/driver.py:1461
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1532
+#: nova/virt/libvirt/driver.py:1535
 #, 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:1538
+#: nova/virt/libvirt/driver.py:1541
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1542
+#: nova/virt/libvirt/driver.py:1545
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1546
+#: nova/virt/libvirt/driver.py:1549
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1562
+#: nova/virt/libvirt/driver.py:1565
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1852
+#: nova/virt/libvirt/driver.py:1855
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1856
+#: nova/virt/libvirt/driver.py:1859
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1873
+#: nova/virt/libvirt/driver.py:1876
 #, 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:2125
+#: nova/virt/libvirt/driver.py:2128
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2313
+#: nova/virt/libvirt/driver.py:2316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2321
+#: nova/virt/libvirt/driver.py:2324
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2356
+#: nova/virt/libvirt/driver.py:2359
 #, 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:2381
+#: nova/virt/libvirt/driver.py:2384
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2393
+#: nova/virt/libvirt/driver.py:2396
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6448,51 +6466,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2410
+#: nova/virt/libvirt/driver.py:2413
 #, 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:2458
+#: nova/virt/libvirt/driver.py:2461
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2528
+#: nova/virt/libvirt/driver.py:2531
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2572
+#: nova/virt/libvirt/driver.py:2575
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2699
+#: nova/virt/libvirt/driver.py:2702
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2748
+#: nova/virt/libvirt/driver.py:2751
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2810
+#: nova/virt/libvirt/driver.py:2813
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2869
+#: nova/virt/libvirt/driver.py:2872
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2876
+#: nova/virt/libvirt/driver.py:2879
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2927
+#: nova/virt/libvirt/driver.py:2930
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6524,138 +6542,153 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:212
+#: nova/virt/libvirt/imagebackend.py:213
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:275
+#: nova/virt/libvirt/imagebackend.py:276
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:167
+#: nova/virt/libvirt/imagecache.py:111
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:151
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:173
+#, python-format
+msgid "Writing stored info to %s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:294
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:172
+#: nova/virt/libvirt/imagecache.py:299
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:185
+#: nova/virt/libvirt/imagecache.py:312
 #, 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:261
+#: nova/virt/libvirt/imagecache.py:388
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:271
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): image verification skipped, no hash "
 "stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:280
+#: nova/virt/libvirt/imagecache.py:407
 #, python-format
 msgid "%(id)s (%(base_file)s): generating checksum"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:295
+#: nova/virt/libvirt/imagecache.py:422
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:307
+#: nova/virt/libvirt/imagecache.py:434
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:310
+#: nova/virt/libvirt/imagecache.py:437
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:317
+#: nova/virt/libvirt/imagecache.py:444
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:328
+#: nova/virt/libvirt/imagecache.py:455
 #, python-format
 msgid "image %(id)s at (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:352
+#: nova/virt/libvirt/imagecache.py:479
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): in use: on this node %(local)d local, "
 "%(remote)d on other nodes sharing this instance storage"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:364
+#: nova/virt/libvirt/imagecache.py:491
 #, python-format
 msgid ""
 "image %(id)s at (%(base_file)s): warning -- an absent base file is in "
 "use! instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:376
+#: nova/virt/libvirt/imagecache.py:503
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:383
+#: nova/virt/libvirt/imagecache.py:510
 #, python-format
 msgid "image %(id)s at (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:407
+#: nova/virt/libvirt/imagecache.py:534
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:538
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:545
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:436
+#: nova/virt/libvirt/imagecache.py:563
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:441
+#: nova/virt/libvirt/imagecache.py:568
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:444
+#: nova/virt/libvirt/imagecache.py:571
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:448
+#: nova/virt/libvirt/imagecache.py:575
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:456
+#: nova/virt/libvirt/imagecache.py:583
 msgid "Verification complete"
 msgstr ""
 
@@ -6664,14 +6697,14 @@ msgstr ""
 msgid "LVM snapshots not implemented"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:133
+#: nova/virt/libvirt/utils.py:114
 #, python-format
 msgid ""
 "Insufficient Space on Volume Group %(vg)s. Only %(free_space)db "
 "available, but %(size)db required by volume %(lv)s."
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:142
+#: nova/virt/libvirt/utils.py:123
 #, python-format
 msgid ""
 "Volume group %(vg)s will not be able to hold sparse volume %(lv)s. "
@@ -6679,30 +6712,15 @@ msgid ""
 "%(free_space)db."
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:189
+#: nova/virt/libvirt/utils.py:170
 #, python-format
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:408
+#: nova/virt/libvirt/utils.py:389
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:478
-#, python-format
-msgid "Error reading image info file %(filename)s: %(error)s"
-msgstr ""
-
-#: nova/virt/libvirt/utils.py:518
-#, python-format
-msgid "Reading image info file: %s"
-msgstr ""
-
-#: nova/virt/libvirt/utils.py:540
-#, python-format
-msgid "Writing stored info to %s"
-msgstr ""
-
 #: nova/virt/libvirt/vif.py:95
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"