diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index e8cb7d903a6d..4aab88bdd9e7 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-12-22 00:02+0000\n"
+"POT-Creation-Date: 2012-12-24 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"
@@ -1236,89 +1236,89 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:197
+#: nova/utils.py:194
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:208
+#: nova/utils.py:205
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:232 nova/utils.py:310 nova/virt/powervm/common.py:82
+#: nova/utils.py:229 nova/utils.py:307 nova/virt/powervm/common.py:82
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:245
+#: nova/utils.py:242
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:285
+#: nova/utils.py:282
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:287
+#: nova/utils.py:284
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:288
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:326
+#: nova/utils.py:323
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:488
+#: nova/utils.py:485
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:491
+#: nova/utils.py:488
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:526
+#: nova/utils.py:523
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:587
+#: nova/utils.py:584
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:647
+#: nova/utils.py:644
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:776
+#: nova/utils.py:773
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:805
+#: nova/utils.py:802
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:929
+#: nova/utils.py:926
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1006
+#: nova/utils.py:1003
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1116 nova/virt/configdrive.py:165
+#: nova/utils.py:1113 nova/virt/configdrive.py:165
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2308,7 +2308,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1200
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:227
+#: nova/api/openstack/compute/contrib/coverage_ext.py:223
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
@@ -2474,7 +2474,7 @@ msgid ""
 "again in a few minutes"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/cloudpipe_update.py:46
+#: nova/api/openstack/compute/contrib/cloudpipe_update.py:44
 #, python-format
 msgid "Unknown action %s"
 msgstr ""
@@ -2491,17 +2491,17 @@ msgstr ""
 msgid "Unable to get console"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:91
+#: nova/api/openstack/compute/contrib/coverage_ext.py:87
 #, python-format
 msgid "Can't connect to service: %s, no portspecified\n"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:94
+#: nova/api/openstack/compute/contrib/coverage_ext.py:90
 #, python-format
 msgid "No backdoor API command for service: %s\n"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:225
+#: nova/api/openstack/compute/contrib/coverage_ext.py:221
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2593,12 +2593,12 @@ msgstr ""
 msgid "Error. Unable to associate floating ip"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips_bulk.py:150
+#: nova/api/openstack/compute/contrib/floating_ips_bulk.py:147
 #, python-format
 msgid "/%s should be specified as single address(es) not in cidr format"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/fping.py:57
+#: nova/api/openstack/compute/contrib/fping.py:56
 msgid "fping utility is not found."
 msgstr ""
 
@@ -2686,63 +2686,63 @@ msgstr ""
 msgid "Unable to find address %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:73
+#: nova/api/openstack/compute/contrib/networks.py:72
 #, python-format
 msgid "Disassociating network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:78
-#: nova/api/openstack/compute/contrib/networks.py:88
-#: nova/api/openstack/compute/contrib/networks.py:98
-#: nova/api/openstack/compute/contrib/networks_associate.py:29
-#: nova/api/openstack/compute/contrib/networks_associate.py:40
-#: nova/api/openstack/compute/contrib/networks_associate.py:52
+#: nova/api/openstack/compute/contrib/networks.py:77
+#: nova/api/openstack/compute/contrib/networks.py:87
+#: nova/api/openstack/compute/contrib/networks.py:97
+#: nova/api/openstack/compute/contrib/networks_associate.py:27
+#: nova/api/openstack/compute/contrib/networks_associate.py:38
+#: nova/api/openstack/compute/contrib/networks_associate.py:50
 msgid "Network not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:84
+#: nova/api/openstack/compute/contrib/networks.py:83
 #, python-format
 msgid "Showing network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:94
+#: nova/api/openstack/compute/contrib/networks.py:93
 #, python-format
 msgid "Deleting network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:109
+#: nova/api/openstack/compute/contrib/networks.py:108
 msgid "Missing network in body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:113
+#: nova/api/openstack/compute/contrib/networks.py:112
 msgid "Network label is required"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:117
+#: nova/api/openstack/compute/contrib/networks.py:116
 msgid "Network cidr or cidr_v6 is required"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:119
+#: nova/api/openstack/compute/contrib/networks.py:118
 #, python-format
 msgid "Creating network with label %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:135
+#: nova/api/openstack/compute/contrib/networks.py:134
 #, python-format
 msgid "Associating network %(network)s with project %(project)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks.py:143
+#: nova/api/openstack/compute/contrib/networks.py:142
 #, python-format
 msgid "Cannot associate network %(network)s with project %(project)s: %(message)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks_associate.py:25
+#: nova/api/openstack/compute/contrib/networks_associate.py:23
 #, python-format
 msgid "Disassociating host with network with id %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/networks_associate.py:36
+#: nova/api/openstack/compute/contrib/networks_associate.py:34
 #, python-format
 msgid "Disassociating project with network with id %s"
 msgstr ""
@@ -3137,604 +3137,604 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:200
+#: nova/compute/manager.py:199
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:330
+#: nova/compute/manager.py:329
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:359
+#: nova/compute/manager.py:358
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:378
+#: nova/compute/manager.py:377
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:390
+#: nova/compute/manager.py:389
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:403
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:414
+#: nova/compute/manager.py:413
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:445
+#: nova/compute/manager.py:444
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:520
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:593 nova/compute/manager.py:1826
+#: nova/compute/manager.py:592 nova/compute/manager.py:1825
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:626
+#: nova/compute/manager.py:625
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:649
+#: nova/compute/manager.py:648
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:682 nova/compute/manager.py:1877
+#: nova/compute/manager.py:681 nova/compute/manager.py:1876
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:699
+#: nova/compute/manager.py:698
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:704
+#: nova/compute/manager.py:703
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:709
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:733
+#: nova/compute/manager.py:732
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:763
+#: nova/compute/manager.py:762
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:809
+#: nova/compute/manager.py:808
 #, 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:815
+#: nova/compute/manager.py:814
 #, 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:825
+#: nova/compute/manager.py:824
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:846
+#: nova/compute/manager.py:845
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:850
+#: nova/compute/manager.py:849
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:863
+#: nova/compute/manager.py:862
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:881
+#: nova/compute/manager.py:880
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:905
+#: nova/compute/manager.py:904
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:977
+#: nova/compute/manager.py:976
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1008
+#: nova/compute/manager.py:1007
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1010
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1018
+#: nova/compute/manager.py:1017
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1043
+#: nova/compute/manager.py:1042
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1083 nova/compute/manager.py:2045
-#: nova/compute/manager.py:3371
+#: nova/compute/manager.py:1082 nova/compute/manager.py:2044
+#: nova/compute/manager.py:3370
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1217
+#: nova/compute/manager.py:1216
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1303
+#: nova/compute/manager.py:1302
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1327
+#: nova/compute/manager.py:1326
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1336
+#: nova/compute/manager.py:1335
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1373
+#: nova/compute/manager.py:1372
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1379
+#: nova/compute/manager.py:1378
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1432
+#: nova/compute/manager.py:1431
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1439
+#: nova/compute/manager.py:1438
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1444
+#: nova/compute/manager.py:1443
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1475
+#: nova/compute/manager.py:1474
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1482
+#: nova/compute/manager.py:1481
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1492
+#: nova/compute/manager.py:1491
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1508
+#: nova/compute/manager.py:1507
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1515
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1531
+#: nova/compute/manager.py:1530
 #, 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:1535
+#: nova/compute/manager.py:1534
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1556
+#: nova/compute/manager.py:1555
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:1569
+#: nova/compute/manager.py:1568
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1603
+#: nova/compute/manager.py:1602
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1624
+#: nova/compute/manager.py:1623
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1793
+#: nova/compute/manager.py:1792
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:1799
+#: nova/compute/manager.py:1798
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1807
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2042
+#: nova/compute/manager.py:2041
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2098
+#: nova/compute/manager.py:2097
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2115
+#: nova/compute/manager.py:2114
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2153
+#: nova/compute/manager.py:2152
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2183
+#: nova/compute/manager.py:2182
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2205
+#: nova/compute/manager.py:2204
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2210
+#: nova/compute/manager.py:2209
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2213
+#: nova/compute/manager.py:2212
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2230
+#: nova/compute/manager.py:2229
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2255
+#: nova/compute/manager.py:2254
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2283
+#: nova/compute/manager.py:2282
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2327
+#: nova/compute/manager.py:2326
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2336
+#: nova/compute/manager.py:2335
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2351
+#: nova/compute/manager.py:2350
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2380
+#: nova/compute/manager.py:2379
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2383
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2397
+#: nova/compute/manager.py:2396
 #, python-format
 msgid "Faild to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2422
+#: nova/compute/manager.py:2421
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:2459
+#: nova/compute/manager.py:2458
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2532
+#: nova/compute/manager.py:2531
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2593
+#: nova/compute/manager.py:2592
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2621
+#: nova/compute/manager.py:2620
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2674
+#: nova/compute/manager.py:2673
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2676
+#: nova/compute/manager.py:2675
 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:2690
+#: nova/compute/manager.py:2689
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:2834
+#: nova/compute/manager.py:2833
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2878
+#: nova/compute/manager.py:2877
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:2884
+#: nova/compute/manager.py:2883
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:2893
+#: nova/compute/manager.py:2892
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:2900
+#: nova/compute/manager.py:2899
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2904
+#: nova/compute/manager.py:2903
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:2911
+#: nova/compute/manager.py:2910
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, notRESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:2919
+#: nova/compute/manager.py:2918
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:2936
+#: nova/compute/manager.py:2935
 #, 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:2954
+#: nova/compute/manager.py:2953
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:2977
+#: nova/compute/manager.py:2976
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3090
+#: nova/compute/manager.py:3089
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3108
+#: nova/compute/manager.py:3107
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3136
+#: nova/compute/manager.py:3135
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3142 nova/compute/manager.py:3180
+#: nova/compute/manager.py:3141 nova/compute/manager.py:3179
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3167
+#: nova/compute/manager.py:3166
 #, 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:3203
+#: nova/compute/manager.py:3202
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3215 nova/compute/manager.py:3226
-#: nova/compute/manager.py:3240
+#: nova/compute/manager.py:3214 nova/compute/manager.py:3225
+#: nova/compute/manager.py:3239
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3220
+#: nova/compute/manager.py:3219
 msgid "Instance is paused or suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3233
+#: nova/compute/manager.py:3232
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3249
+#: nova/compute/manager.py:3248
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3257
+#: nova/compute/manager.py:3256
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:3270
+#: nova/compute/manager.py:3269
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:3325
+#: nova/compute/manager.py:3324
 #, 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:3332
+#: nova/compute/manager.py:3331
 #, 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:3339
+#: nova/compute/manager.py:3338
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:93
+#: nova/compute/resource_tracker.py:92
 msgid ""
 "Host field should not be set on the instance until resources have been "
 "claimed."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:98
+#: nova/compute/resource_tracker.py:97
 msgid ""
 "Node field should be not be set on the instance until resources have been"
 " claimed."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:245
+#: nova/compute/resource_tracker.py:244
 msgid "Auditing locally available compute resources"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:249
+#: nova/compute/resource_tracker.py:248
 msgid ""
 "Virt driver does not support 'get_available_resource'  Compute tracking "
 "is disabled."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:300
+#: nova/compute/resource_tracker.py:299
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/compute/resource_tracker.py:305
+#: nova/compute/resource_tracker.py:304
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/compute/resource_tracker.py:318
+#: nova/compute/resource_tracker.py:317
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:328
+#: nova/compute/resource_tracker.py:327
 #, python-format
 msgid "Hypervisor: free ram (MB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:329
+#: nova/compute/resource_tracker.py:328
 #, python-format
 msgid "Hypervisor: free disk (GB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:334
+#: nova/compute/resource_tracker.py:333
 #, python-format
 msgid "Hypervisor: free VCPUs: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:336
+#: nova/compute/resource_tracker.py:335
 msgid "Hypervisor: VCPU information unavailable"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:343
+#: nova/compute/resource_tracker.py:342
 #, python-format
 msgid "Free ram (MB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:344
+#: nova/compute/resource_tracker.py:343
 #, python-format
 msgid "Free disk (GB): %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:349
+#: nova/compute/resource_tracker.py:348
 #, python-format
 msgid "Free VCPUS: %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:351
+#: nova/compute/resource_tracker.py:350
 msgid "Free VCPU information unavailable"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:389
+#: nova/compute/resource_tracker.py:388
 #, python-format
 msgid "Updating from migration %s"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:447
+#: nova/compute/resource_tracker.py:446
 msgid "Instance not resizing, skipping migration."
 msgstr ""
 
-#: nova/compute/resource_tracker.py:536
+#: nova/compute/resource_tracker.py:535
 #, python-format
 msgid ""
 "Detected running orphan instance: %(uuid)s (consuming %(memory_mb)s MB "
 "memory"
 msgstr ""
 
-#: nova/compute/resource_tracker.py:549
+#: nova/compute/resource_tracker.py:548
 #, python-format
 msgid "Missing keys: %s"
 msgstr ""
@@ -3776,32 +3776,40 @@ msgstr ""
 msgid "Rebuilding xvp conf"
 msgstr ""
 
-#: nova/console/xvp.py:117
+#: nova/console/xvp.py:118
 #, python-format
 msgid "Re-wrote %s"
 msgstr ""
 
 #: nova/console/xvp.py:122
+msgid "Failed to write configuration file"
+msgstr ""
+
+#: nova/console/xvp.py:126
 msgid "Stopping xvp"
 msgstr ""
 
-#: nova/console/xvp.py:135
+#: nova/console/xvp.py:139
 msgid "Starting xvp"
 msgstr ""
 
-#: nova/console/xvp.py:142
+#: nova/console/xvp.py:146
 #, python-format
 msgid "Error starting xvp: %s"
 msgstr ""
 
-#: nova/console/xvp.py:145
+#: nova/console/xvp.py:149
 msgid "Restarting xvp"
 msgstr ""
 
-#: nova/console/xvp.py:147
+#: nova/console/xvp.py:151
 msgid "xvp not running..."
 msgstr ""
 
+#: nova/console/xvp.py:202
+msgid "Failed to run xvp."
+msgstr ""
+
 #: nova/consoleauth/manager.py:70
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
@@ -3812,19 +3820,19 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:183 nova/virt/baremetal/db/sqlalchemy/api.py:68
+#: nova/db/sqlalchemy/api.py:183 nova/virt/baremetal/db/sqlalchemy/api.py:61
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1374
+#: nova/db/sqlalchemy/api.py:1372
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2746
+#: nova/db/sqlalchemy/api.py:2732
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
@@ -3839,20 +3847,20 @@ msgstr ""
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:321
+#: nova/db/sqlalchemy/session.py:385
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:378
+#: nova/db/sqlalchemy/session.py:442
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:419
+#: nova/db/sqlalchemy/session.py:483
 msgid "Using mysql/eventlet db_pool."
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:463
+#: nova/db/sqlalchemy/session.py:527
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
@@ -3934,25 +3942,25 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:51
+#: nova/network/api.py:50
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:77
+#: nova/network/api.py:76
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:78
+#: nova/network/api.py:77
 #, python-format
 msgid "args: %s"
 msgstr ""
 
-#: nova/network/api.py:79
+#: nova/network/api.py:78
 #, python-format
 msgid "kwargs: %s"
 msgstr ""
 
-#: nova/network/api.py:172
+#: nova/network/api.py:171
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -4794,24 +4802,24 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:61
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:67 nova/scheduler/manager.py:186
+#: nova/scheduler/driver.py:65 nova/scheduler/manager.py:186
 #, python-format
 msgid "Setting instance to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:144
+#: nova/scheduler/driver.py:142
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:152
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:284
+#: nova/scheduler/driver.py:282
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4904,12 +4912,12 @@ msgstr ""
 msgid "%(host_state)s fails instance_type extra_specs requirements"
 msgstr ""
 
-#: nova/scheduler/filters/compute_filter.py:40
+#: nova/scheduler/filters/compute_filter.py:39
 #, python-format
 msgid "%(host_state)s is disabled or has not been heard from in a while"
 msgstr ""
 
-#: nova/scheduler/filters/compute_filter.py:44
+#: nova/scheduler/filters/compute_filter.py:43
 #, python-format
 msgid "%(host_state)s is disabled via capabilities"
 msgstr ""
@@ -5105,7 +5113,7 @@ msgstr ""
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
-#: nova/tests/test_misc.py:62
+#: nova/tests/test_misc.py:57
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -5280,22 +5288,22 @@ msgstr ""
 msgid "Failed to get info for disk %s"
 msgstr ""
 
-#: nova/tests/hyperv/mockproxy.py:74
+#: nova/tests/hyperv/mockproxy.py:73
 #, python-format
 msgid "Couldn't find invocation num. %(c)d of attribute \"%(name)s\""
 msgstr ""
 
-#: nova/tests/hyperv/mockproxy.py:93 nova/tests/hyperv/mockproxy.py:121
+#: nova/tests/hyperv/mockproxy.py:92 nova/tests/hyperv/mockproxy.py:120
 #, python-format
 msgid "Couldn't find attribute \"%s\""
 msgstr ""
 
-#: nova/tests/hyperv/mockproxy.py:98
+#: nova/tests/hyperv/mockproxy.py:97
 #, python-format
 msgid "Couldn't find attribute \"%(name)s\" with arguments \"%(params)s\""
 msgstr ""
 
-#: nova/tests/hyperv/mockproxy.py:101
+#: nova/tests/hyperv/mockproxy.py:100
 #, python-format
 msgid ""
 "Couldn't find invocation num. %(c)d of attribute \"%(name)s\" with "
@@ -5539,22 +5547,22 @@ msgstr ""
 msgid "detach volume could not find tid for %s"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:260
+#: nova/virt/baremetal/db/sqlalchemy/api.py:253
 msgid "No more PXE IPs available"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:282
-#: nova/virt/baremetal/db/sqlalchemy/api.py:323
+#: nova/virt/baremetal/db/sqlalchemy/api.py:275
+#: nova/virt/baremetal/db/sqlalchemy/api.py:316
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:333
+#: nova/virt/baremetal/db/sqlalchemy/api.py:326
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:347
+#: nova/virt/baremetal/db/sqlalchemy/api.py:340
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -5723,7 +5731,7 @@ msgid "No free nbd devices"
 msgstr ""
 
 #: nova/virt/disk/mount/nbd.py:59
-msgid "ndb module not loaded"
+msgid "nbd module not loaded"
 msgstr ""
 
 #: nova/virt/disk/mount/nbd.py:60
@@ -5922,7 +5930,7 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/basevolumeutils.py:79 nova/virt/libvirt/driver.py:1509
+#: nova/virt/hyperv/basevolumeutils.py:79 nova/virt/libvirt/driver.py:1510
 #: nova/virt/xenapi/vm_utils.py:504
 #, python-format
 msgid "block_device_list %s"
@@ -5971,8 +5979,8 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:163 nova/virt/libvirt/driver.py:3172
-#: nova/virt/xenapi/host.py:150
+#: nova/virt/hyperv/hostops.py:163 nova/virt/libvirt/driver.py:3173
+#: nova/virt/xenapi/host.py:149
 msgid "Updating host stats"
 msgstr ""
 
@@ -6155,16 +6163,16 @@ msgstr ""
 msgid "Invalid config_drive_format \"%s\""
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:183 nova/virt/libvirt/driver.py:1442
+#: nova/virt/hyperv/vmops.py:183 nova/virt/libvirt/driver.py:1443
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:194 nova/virt/libvirt/driver.py:1452
+#: nova/virt/hyperv/vmops.py:194 nova/virt/libvirt/driver.py:1453
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:201 nova/virt/libvirt/driver.py:1457
+#: nova/virt/hyperv/vmops.py:201 nova/virt/libvirt/driver.py:1458
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -6660,109 +6668,109 @@ msgstr ""
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1472
+#: nova/virt/libvirt/driver.py:1473
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1482
+#: nova/virt/libvirt/driver.py:1483
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1561
+#: nova/virt/libvirt/driver.py:1562
 #, 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:1567
+#: nova/virt/libvirt/driver.py:1568
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1571
+#: nova/virt/libvirt/driver.py:1572
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1575
+#: nova/virt/libvirt/driver.py:1576
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1591
+#: nova/virt/libvirt/driver.py:1592
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1908
+#: nova/virt/libvirt/driver.py:1909
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1912
+#: nova/virt/libvirt/driver.py:1913
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1929
+#: nova/virt/libvirt/driver.py:1930
 #, 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:2061
+#: nova/virt/libvirt/driver.py:2062
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2178
+#: nova/virt/libvirt/driver.py:2179
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2261
+#: nova/virt/libvirt/driver.py:2262
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2285
+#: nova/virt/libvirt/driver.py:2286
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2289
+#: nova/virt/libvirt/driver.py:2290
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2405
+#: nova/virt/libvirt/driver.py:2406
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2413
+#: nova/virt/libvirt/driver.py:2414
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2450
+#: nova/virt/libvirt/driver.py:2451
 #, 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:2475
+#: nova/virt/libvirt/driver.py:2476
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2487
+#: nova/virt/libvirt/driver.py:2488
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -6772,51 +6780,51 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2504
+#: nova/virt/libvirt/driver.py:2505
 #, 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:2552
+#: nova/virt/libvirt/driver.py:2553
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2624
+#: nova/virt/libvirt/driver.py:2625
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2714
+#: nova/virt/libvirt/driver.py:2715
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2829
+#: nova/virt/libvirt/driver.py:2830
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2878
+#: nova/virt/libvirt/driver.py:2879
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2927
+#: nova/virt/libvirt/driver.py:2928
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2986
+#: nova/virt/libvirt/driver.py:2987
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2993
+#: nova/virt/libvirt/driver.py:2994
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3044
+#: nova/virt/libvirt/driver.py:3045
 msgid "Starting finish_revert_migration"
 msgstr ""
 
@@ -6848,11 +6856,11 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:213
+#: nova/virt/libvirt/imagebackend.py:207
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:276
+#: nova/virt/libvirt/imagebackend.py:270
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
@@ -7003,14 +7011,14 @@ msgstr ""
 msgid "LVM snapshots not implemented"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:114
+#: nova/virt/libvirt/utils.py:113
 #, 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:123
+#: nova/virt/libvirt/utils.py:122
 #, python-format
 msgid ""
 "Volume group %(vg)s will not be able to hold sparse volume %(lv)s. "
@@ -7018,12 +7026,12 @@ msgid ""
 "%(free_space)db."
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:170
+#: nova/virt/libvirt/utils.py:169
 #, python-format
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:436
+#: nova/virt/libvirt/utils.py:435
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
@@ -7063,62 +7071,62 @@ msgstr ""
 msgid "%s is already mounted"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:74
+#: nova/virt/powervm/blockdev.py:73
 #, python-format
 msgid "Removing the logical volume '%s'"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:92
+#: nova/virt/powervm/blockdev.py:91
 #, python-format
 msgid "Fetching image '%s' from glance"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:97
+#: nova/virt/powervm/blockdev.py:96
 #, python-format
 msgid "Using image found at '%s'"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:99
+#: nova/virt/powervm/blockdev.py:98
 #, python-format
 msgid "Ensuring image '%s' exists on IVM"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:110
+#: nova/virt/powervm/blockdev.py:109
 #, python-format
 msgid "Creating logical volume of size %s bytes"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:113
+#: nova/virt/powervm/blockdev.py:112
 #, python-format
 msgid "Copying image to the device '%s'"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:116
+#: nova/virt/powervm/blockdev.py:115
 msgid "Error while creating logical volume from image. Will attempt cleanup."
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:123
+#: nova/virt/powervm/blockdev.py:122
 msgid "Error while attempting cleanup of failed deploy to logical volume."
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:175
+#: nova/virt/powervm/blockdev.py:174
 msgid "Could not create logical volume. No space left on any volume group."
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:246
+#: nova/virt/powervm/blockdev.py:245
 msgid "Unable to get checksum"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:249
+#: nova/virt/powervm/blockdev.py:248
 msgid "Image checksums do not match"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:270
+#: nova/virt/powervm/blockdev.py:269
 #, python-format
 msgid "Image found on host at '%s'"
 msgstr ""
 
-#: nova/virt/powervm/blockdev.py:278
+#: nova/virt/powervm/blockdev.py:277
 msgid "Uncompressed image file not found"
 msgstr ""
 
@@ -7752,35 +7760,35 @@ msgstr ""
 msgid "OpenSSL error: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:134
+#: nova/virt/xenapi/driver.py:133
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "compute_driver=xenapi.XenAPIDriver"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:161
+#: nova/virt/xenapi/driver.py:160
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:355
+#: nova/virt/xenapi/driver.py:354
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:567
+#: nova/virt/xenapi/driver.py:566
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:627
+#: nova/virt/xenapi/driver.py:626
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:667
+#: nova/virt/xenapi/driver.py:666
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:751 nova/virt/xenapi/driver.py:765
+#: nova/virt/xenapi/driver.py:750 nova/virt/xenapi/driver.py:764
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -7817,38 +7825,38 @@ msgid ""
 "with the wrong number of arguments"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:70
+#: nova/virt/xenapi/host.py:69
 #, python-format
 msgid ""
 "Instance %(name)s running on %(host)s could not be found in the database:"
 " assuming it is a worker VM and skip ping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:82
+#: nova/virt/xenapi/host.py:81
 #, python-format
 msgid "Aggregate for host %(host)s count not be found."
 msgstr ""
 
-#: nova/virt/xenapi/host.py:103
+#: nova/virt/xenapi/host.py:102
 #, python-format
 msgid "Unable to migrate VM %(vm_ref)sfrom %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:158
+#: nova/virt/xenapi/host.py:157
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:193
+#: nova/virt/xenapi/host.py:192
 #, python-format
 msgid "Failed to extract instance support from %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:210
+#: nova/virt/xenapi/host.py:209
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:213
+#: nova/virt/xenapi/host.py:212
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -7868,44 +7876,44 @@ msgstr ""
 msgid "Found no network for bridge %s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:71
+#: nova/virt/xenapi/pool.py:70
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:158
+#: nova/virt/xenapi/pool.py:157
 #, python-format
 msgid "Unable to eject %(host)s from the pool; pool not empty"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:175
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:192
+#: nova/virt/xenapi/pool.py:191
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:195
+#: nova/virt/xenapi/pool.py:194
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:211
+#: nova/virt/xenapi/pool.py:210
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:223
+#: nova/virt/xenapi/pool.py:222
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:234
+#: nova/virt/xenapi/pool.py:233
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""