Cleanup of Translations

In preparation for the release, do some cleanups for translations.

Removes all po files that are partially translated. The translation
team has decided to exclude files with less than 66 % of translated
content. There is no content lost, all data is in the translation
server, we just remove it from the repository.

This updates also recreates pot (translation source files) to
reflect the state of the repository in case there was no recent
import for them.

This change needs to be done manually since the automatic import does
not handle some of these cases.

Change-Id: I2ca4decc5fc897d8cd396160aa6a745f65768930

4 files changed, 480 insertions, 399 deletions

diff --git a/ironic/locale/ironic-log-error.pot b/ironic/locale/ironic-log-error.pot
index 2ecfab7d7..700a096c6 100644
--- a/ironic/locale/ironic-log-error.pot
+++ b/ironic/locale/ironic-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ironic 4.1.1.dev38\n"
+"Project-Id-Version: ironic 4.1.0.106.gecf6fc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:25+0000\n"
+"POT-Creation-Date: 2015-09-24 21:22+0200\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"
@@ -72,14 +72,14 @@ msgstr ""
 msgid "Failed to create a file system in %(path)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/common/glance_service/base_image_service.py:129
+#: ironic/common/glance_service/base_image_service.py:128
 #, python-format
 msgid ""
 "Error contacting glance server '%(host)s:%(port)s' for '%(method)s', "
 "attempt %(attempt)s of %(num_attempts)s failed."
 msgstr ""
 
-#: ironic/conductor/manager.py:263
+#: ironic/conductor/manager.py:264
 #, python-format
 msgid ""
 "Conductor %s cannot be started because no drivers were loaded.  This "
@@ -87,49 +87,56 @@ msgid ""
 "option."
 msgstr ""
 
-#: ironic/conductor/manager.py:801
+#: ironic/conductor/manager.py:802
 #, python-format
 msgid "Error in tear_down of node %(node)s: %(err)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1464
+#: ironic/conductor/manager.py:1108
+#, python-format
+msgid ""
+"Failed to tear down cleaning for node %(node)s after aborting the "
+"operation. Error: %(err)s"
+msgstr ""
+
+#: ironic/conductor/manager.py:1569
 #, python-format
 msgid "Failed to stop console while deleting the node %(node)s: %(err)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:2155
+#: ironic/conductor/manager.py:2365
 #, python-format
 msgid "Error while uploading the configdrive for %(node)s to Swift"
 msgstr ""
 
-#: ironic/conductor/manager.py:2166
+#: ironic/conductor/manager.py:2376
 #, python-format
 msgid "Error while preparing to deploy to node %(node)s: %(err)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:2176
+#: ironic/conductor/manager.py:2386
 #, python-format
 msgid "Error in deploy of node %(node)s: %(err)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:2193
+#: ironic/conductor/manager.py:2403
 #, python-format
 msgid "Unexpected state %(state)s returned while deploying node %(node)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:2319
+#: ironic/conductor/manager.py:2529
 #, python-format
 msgid ""
 "Failed to change power state of node %(node)s to '%(state)s', attempt "
 "%(attempt)s of %(retries)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:2353
+#: ironic/conductor/manager.py:2563
 #, python-format
 msgid "Failed to inspect node %(node)s: %(err)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:2388
+#: ironic/conductor/manager.py:2599
 #, python-format
 msgid "Failed to tear down cleaning on node %(uuid)s, reason: %(err)s"
 msgstr ""
@@ -169,7 +176,7 @@ msgstr ""
 msgid "vendor_passthru failed with method %s"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:151
+#: ironic/drivers/modules/agent.py:131
 #, python-format
 msgid ""
 "Agent deploy supports only HTTP(S) URLs as instance_info['image_source']."
@@ -181,61 +188,61 @@ msgstr ""
 msgid "Could not find matching node for the provided MACs %s."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:472
+#: ironic/drivers/modules/deploy_utils.py:489
 #, python-format
 msgid ""
 "Failed to erase beginning of disk for node %(node)s. Command: "
 "%(command)s. Error: %(error)s."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:484
+#: ironic/drivers/modules/deploy_utils.py:501
 #, python-format
 msgid ""
 "Failed to get disk block count for node %(node)s. Command: %(command)s. "
 "Error: %(error)s."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:497
+#: ironic/drivers/modules/deploy_utils.py:514
 #, python-format
 msgid ""
 "Failed to erase the end of the disk on node %(node)s. Command: "
 "%(command)s. Error: %(error)s."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:687
+#: ironic/drivers/modules/deploy_utils.py:704
 #, python-format
 msgid "Failed to detect %s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:785
-#: ironic/drivers/modules/deploy_utils.py:791
+#: ironic/drivers/modules/deploy_utils.py:802
+#: ironic/drivers/modules/deploy_utils.py:808
 #, python-format
 msgid "Deploy to address %s failed."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:786
+#: ironic/drivers/modules/deploy_utils.py:803
 #, python-format
 msgid "Command: %s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:787
+#: ironic/drivers/modules/deploy_utils.py:804
 #, python-format
 msgid "StdOut: %r"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:788
+#: ironic/drivers/modules/deploy_utils.py:805
 #, python-format
 msgid "StdErr: %r"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:873
+#: ironic/drivers/modules/deploy_utils.py:890
 #, python-format
 msgid ""
 "Internal error. Node %(node)s in provision state \"%(state)s\" could not "
 "transition to a failed state."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:881
+#: ironic/drivers/modules/deploy_utils.py:898
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -305,11 +312,11 @@ msgstr ""
 msgid "IPMI \"bmc reset\" failed for node %(node_id)s with error: %(error)s."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:625
-#: ironic/drivers/modules/iscsi_deploy.py:848
-#: ironic/drivers/modules/iscsi_deploy.py:887
-#: ironic/drivers/modules/ilo/deploy.py:964
-#: ironic/drivers/modules/irmc/deploy.py:868
+#: ironic/drivers/modules/iscsi_deploy.py:624
+#: ironic/drivers/modules/iscsi_deploy.py:847
+#: ironic/drivers/modules/iscsi_deploy.py:886
+#: ironic/drivers/modules/ilo/deploy.py:1032
+#: ironic/drivers/modules/irmc/deploy.py:871
 #, python-format
 msgid "Deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
@@ -340,17 +347,17 @@ msgid ""
 "error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:280
+#: ironic/drivers/modules/ssh.py:294
 #, python-format
 msgid "Cannot execute SSH cmd %(cmd)s. Reason: %(err)s."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:381
+#: ironic/drivers/modules/ssh.py:394
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:669
+#: ironic/drivers/modules/ssh.py:682
 #, python-format
 msgid ""
 "Failed to set boot device for node %(node)s, virt_type %(vtype)s does not"
@@ -496,7 +503,7 @@ msgstr ""
 msgid "Error while deleting %(object_name)s from %(container)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:123
+#: ironic/drivers/modules/ilo/deploy.py:167
 #, python-format
 msgid ""
 "Virtual media deploy accepts only Glance images or HTTP(S) URLs as "
@@ -504,19 +511,19 @@ msgid ""
 " not reachable."
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:151
+#: ironic/drivers/modules/ilo/deploy.py:195
 #, python-format
 msgid ""
 "Unable to find kernel or ramdisk for image %(image)s to generate boot ISO"
 " for %(node)s"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:207
+#: ironic/drivers/modules/ilo/deploy.py:254
 #, python-format
 msgid "Failed to clean up boot ISO for node %(node)s. Error: %(error)s."
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:862
+#: ironic/drivers/modules/ilo/deploy.py:926
 #, python-format
 msgid "Cannot get boot ISO for node %s"
 msgstr ""
@@ -538,22 +545,22 @@ msgstr ""
 msgid "iLO failed to change state to %(tstate)s within %(timeout)s sec"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:434
+#: ironic/drivers/modules/irmc/deploy.py:437
 #, python-format
 msgid "Error while inserting virtual cdrom from node %(uuid)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:457
+#: ironic/drivers/modules/irmc/deploy.py:460
 #, python-format
 msgid "Error while ejecting virtual cdrom from node %(uuid)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:490
+#: ironic/drivers/modules/irmc/deploy.py:493
 #, python-format
 msgid "Error while inserting virtual floppy from node %(uuid)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:513
+#: ironic/drivers/modules/irmc/deploy.py:516
 #, python-format
 msgid "Error while ejecting virtual floppy from node %(uuid)s. Error: %(error)s"
 msgstr ""
@@ -587,7 +594,7 @@ msgstr ""
 msgid "Reboot failed. Error: %(err_msg)s"
 msgstr ""
 
-#: ironic/drivers/modules/ucs/helper.py:119
+#: ironic/drivers/modules/ucs/helper.py:118
 #, python-format
 msgid "Cisco client: service unavailable for node %(uuid)s."
 msgstr ""
@@ -635,11 +642,6 @@ msgid ""
 "seconds."
 msgstr ""
 
-#: ironic/objects/base.py:173
-#, python-format
-msgid "Unable to instantiate unregistered object type %(objtype)s"
-msgstr ""
-
 #: ironic/tests/db/sqlalchemy/test_migrations.py:169
 #, python-format
 msgid "Failed to migrate to version %(version)s on engine %(engine)s"
diff --git a/ironic/locale/ironic-log-info.pot b/ironic/locale/ironic-log-info.pot
index 50abe8c8d..3d68c88ee 100644
--- a/ironic/locale/ironic-log-info.pot
+++ b/ironic/locale/ironic-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ironic 4.1.1.dev38\n"
+"Project-Id-Version: ironic 4.1.0.106.gecf6fc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:25+0000\n"
+"POT-Creation-Date: 2015-09-24 21:22+0200\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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.0\n"
 
-#: ironic/cmd/api.py:54
+#: ironic/cmd/api.py:58
 #, python-format
 msgid "Serving on http://%(host)s:%(port)s"
 msgstr ""
@@ -44,104 +44,112 @@ msgid ""
 "%(service)s on host %(host)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:315
+#: ironic/conductor/manager.py:316
 #, python-format
 msgid "Successfully started conductor with hostname %(hostname)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:336
+#: ironic/conductor/manager.py:337
 #, python-format
 msgid "Successfully stopped conductor with hostname %(hostname)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:342
+#: ironic/conductor/manager.py:343
 #, python-format
 msgid "Not deregistering conductor with hostname %(hostname)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:809
+#: ironic/conductor/manager.py:810
 #, python-format
 msgid "Successfully unprovisioned node %(node)s with instance %(instance)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:892
+#: ironic/conductor/manager.py:947
 #, python-format
 msgid ""
 "Cleaning is disabled, node %s has been successfully moved to AVAILABLE "
 "state."
 msgstr ""
 
-#: ironic/conductor/manager.py:961
+#: ironic/conductor/manager.py:1000
 #, python-format
 msgid "Executing %(state)s on node %(node)s, remaining steps: %(steps)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:971
+#: ironic/conductor/manager.py:1010
 #, python-format
 msgid "Executing %(step)s on node %(node)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:998
+#: ironic/conductor/manager.py:1037
 #, python-format
 msgid ""
 "Clean step %(step)s on node %(node)s being executed asynchronously, "
 "waiting for driver."
 msgstr ""
 
-#: ironic/conductor/manager.py:1009
+#: ironic/conductor/manager.py:1048
 #, python-format
 msgid "Node %(node)s finished clean step %(step)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1025
+#: ironic/conductor/manager.py:1064
 #, python-format
 msgid "Node %s cleaning complete"
 msgstr ""
 
-#: ironic/conductor/manager.py:1159
+#: ironic/conductor/manager.py:1174
+#, python-format
+msgid ""
+"The current clean step \"%(clean_step)s\" for node %(node)s is not "
+"abortable. Adding a flag to abort the cleaning after the clean step is "
+"completed."
+msgstr ""
+
+#: ironic/conductor/manager.py:1264
 #, python-format
 msgid ""
 "During sync_power_state, node %(node)s was not found and presumed deleted"
 " by another process."
 msgstr ""
 
-#: ironic/conductor/manager.py:1163
+#: ironic/conductor/manager.py:1268
 #, python-format
 msgid ""
 "During sync_power_state, node %(node)s was already locked by another "
 "process. Skip."
 msgstr ""
 
-#: ironic/conductor/manager.py:1468
+#: ironic/conductor/manager.py:1573
 #, python-format
 msgid "Successfully deleted node %(node)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:1488
+#: ironic/conductor/manager.py:1593
 #, python-format
 msgid ""
 "Successfully deleted port %(port)s. The node associated with the port was"
 " %(node)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1562
+#: ironic/conductor/manager.py:1667
 #, python-format
 msgid "No console action was triggered because the console is already %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:2187
+#: ironic/conductor/manager.py:2397
 #, python-format
 msgid "Successfully deployed node %(node)s with instance %(instance)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:2296
+#: ironic/conductor/manager.py:2506
 #, python-format
 msgid ""
 "During sync_power_state, node %(node)s has no previous known state. "
 "Recording current state '%(state)s'."
 msgstr ""
 
-#: ironic/conductor/manager.py:2366
+#: ironic/conductor/manager.py:2576
 #, python-format
 msgid "Successfully inspected node %(node)s"
 msgstr ""
@@ -151,7 +159,7 @@ msgstr ""
 msgid "Successfully set node %(node)s power state to %(state)s."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:456
+#: ironic/drivers/modules/agent.py:417
 #, python-format
 msgid "Image successfully written to node %s"
 msgstr ""
@@ -178,7 +186,7 @@ msgid ""
 msgstr ""
 
 #: ironic/drivers/modules/agent_base_vendor.py:620
-#: ironic/drivers/modules/iscsi_deploy.py:643
+#: ironic/drivers/modules/iscsi_deploy.py:642
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -188,36 +196,36 @@ msgstr ""
 msgid "Local boot successfully configured for node %s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:503
+#: ironic/drivers/modules/deploy_utils.py:520
 #, python-format
 msgid "Disk metadata on %(dev)s successfully destroyed for node %(node)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:616
+#: ironic/drivers/modules/deploy_utils.py:633
 #, python-format
 msgid ""
 "Successfully completed the disk device %(dev)s partitioning for node "
 "%(node)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:649
+#: ironic/drivers/modules/deploy_utils.py:666
 #, python-format
 msgid ""
 "Configdrive for node %(node)s successfully copied onto partition "
 "%(partition)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:660
+#: ironic/drivers/modules/deploy_utils.py:677
 #, python-format
 msgid "Image for %(node)s successfully populated"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:665
+#: ironic/drivers/modules/deploy_utils.py:682
 #, python-format
 msgid "Swap partition %(swap)s successfully formatted for node %(node)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:671
+#: ironic/drivers/modules/deploy_utils.py:688
 #, python-format
 msgid "Ephemeral partition %(ephemeral)s successfully formatted for node %(node)s"
 msgstr ""
@@ -268,7 +276,7 @@ msgstr ""
 msgid "Option %(opt)s is supported by ipmitool"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:608
+#: ironic/drivers/modules/iscsi_deploy.py:607
 #, python-format
 msgid "Bootloader successfully installed on node %s"
 msgstr ""
@@ -323,7 +331,7 @@ msgstr ""
 msgid "Setting up node %s to boot from virtual media"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:385
+#: ironic/drivers/modules/ilo/deploy.py:432
 #, python-format
 msgid "Changed secure boot to %(mode)s for node %(node)s"
 msgstr ""
@@ -357,22 +365,22 @@ msgid ""
 "'reset_ilo_credential' is not performed on node %s."
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:441
+#: ironic/drivers/modules/irmc/deploy.py:444
 #, python-format
 msgid "Attached virtual cdrom successfully for node %s"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:464
+#: ironic/drivers/modules/irmc/deploy.py:467
 #, python-format
 msgid "Detached virtual cdrom successfully for node %s"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:497
+#: ironic/drivers/modules/irmc/deploy.py:500
 #, python-format
 msgid "Attached virtual floppy successfully for node %s"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:520
+#: ironic/drivers/modules/irmc/deploy.py:523
 #, python-format
 msgid "Detached virtual floppy successfully for node %s"
 msgstr ""
diff --git a/ironic/locale/ironic-log-warning.pot b/ironic/locale/ironic-log-warning.pot
index db8bbda55..81bed8f7f 100644
--- a/ironic/locale/ironic-log-warning.pot
+++ b/ironic/locale/ironic-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ironic 4.1.1.dev38\n"
+"Project-Id-Version: ironic 4.1.0.106.gecf6fc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:25+0000\n"
+"POT-Creation-Date: 2015-09-24 21:22+0200\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"
@@ -51,91 +51,91 @@ msgid ""
 "object is not a string: %s,"
 msgstr ""
 
-#: ironic/conductor/manager.py:288
+#: ironic/conductor/manager.py:289
 #, python-format
 msgid ""
 "A conductor with hostname %(hostname)s was previously registered. "
 "Updating registration"
 msgstr ""
 
-#: ironic/conductor/manager.py:376
+#: ironic/conductor/manager.py:377
 msgid "Conductor could not connect to database while heartbeating."
 msgstr ""
 
-#: ironic/conductor/manager.py:919
+#: ironic/conductor/manager.py:974
 msgid ""
 "Returning CLEANING for asynchronous prepare cleaning has been deprecated."
 " Please use CLEANWAIT instead."
 msgstr ""
 
-#: ironic/conductor/manager.py:987
+#: ironic/conductor/manager.py:1026
 msgid ""
 "Returning CLEANING for asynchronous clean steps has been deprecated. "
 "Please use CLEANWAIT instead."
 msgstr ""
 
-#: ironic/conductor/manager.py:1224
+#: ironic/conductor/manager.py:1329
 #, python-format
 msgid ""
 "During checking for deploying state, node %s was not found and presumed "
 "deleted by another process. Skipping."
 msgstr ""
 
-#: ironic/conductor/manager.py:1229
+#: ironic/conductor/manager.py:1334
 #, python-format
 msgid ""
 "During checking for deploying state, when releasing the lock of the node "
 "%s, it was locked by another process. Skipping."
 msgstr ""
 
-#: ironic/conductor/manager.py:1235
+#: ironic/conductor/manager.py:1340
 #, python-format
 msgid ""
 "During checking for deploying state, when releasing the lock of the node "
 "%s, it was already unlocked."
 msgstr ""
 
-#: ironic/conductor/manager.py:1625
+#: ironic/conductor/manager.py:1730
 #, python-format
 msgid ""
 "No VIF found for instance %(instance)s port %(port)s when attempting to "
 "update port MAC address."
 msgstr ""
 
-#: ironic/conductor/manager.py:1683
+#: ironic/conductor/manager.py:1788
 #, python-format
 msgid ""
 "get_sensors_data is not implemented for driver %(driver)s, node_uuid is "
 "%(node)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1688
+#: ironic/conductor/manager.py:1793
 #, python-format
 msgid ""
 "During get_sensors_data, could not parse sensor data for node %(node)s. "
 "Error: %(err)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:1693
+#: ironic/conductor/manager.py:1798
 #, python-format
 msgid ""
 "During get_sensors_data, could not get sensor data for node %(node)s. "
 "Error: %(err)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:1698
+#: ironic/conductor/manager.py:1803
 #, python-format
 msgid ""
 "During send_sensor_data, node %(node)s was not found and presumed deleted"
 " by another process."
 msgstr ""
 
-#: ironic/conductor/manager.py:1703
+#: ironic/conductor/manager.py:1808
 #, python-format
 msgid "Failed to get sensor data for node %(node)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1833
+#: ironic/conductor/manager.py:1938
 #, python-format
 msgid ""
 "Driver '%s' is missing a task argument to the method "
@@ -143,14 +143,14 @@ msgid ""
 " code to include a task argument."
 msgstr ""
 
-#: ironic/conductor/manager.py:2058
+#: ironic/conductor/manager.py:2268
 #, python-format
 msgid ""
 "No free conductor workers available to perform an action on node "
 "%(node)s, setting node's power state back to %(power_state)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:2086
+#: ironic/conductor/manager.py:2296
 #, python-format
 msgid ""
 "No free conductor workers available to perform an action on node "
@@ -158,28 +158,28 @@ msgid ""
 "target_provision_state to %(tgt_prov_state)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:2270
+#: ironic/conductor/manager.py:2480
 #, python-format
 msgid ""
 "During sync_power_state, could not get power state for node %(node)s, "
 "attempt %(attempt)s of %(retries)s. Error: %(err)s."
 msgstr ""
 
-#: ironic/conductor/manager.py:2309
+#: ironic/conductor/manager.py:2519
 #, python-format
 msgid ""
 "During sync_power_state, node %(node)s state '%(actual)s' does not match "
 "expected state. Changing hardware state to '%(state)s'."
 msgstr ""
 
-#: ironic/conductor/manager.py:2327
+#: ironic/conductor/manager.py:2537
 #, python-format
 msgid ""
 "During sync_power_state, node %(node)s state does not match expected "
 "state '%(state)s'. Updating recorded state to '%(actual)s'."
 msgstr ""
 
-#: ironic/conductor/task_manager.py:400
+#: ironic/conductor/task_manager.py:399
 #, python-format
 msgid "Task's on_error hook failed to call %(method)s on node %(node)s"
 msgstr ""
@@ -220,7 +220,7 @@ msgid ""
 " on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/base.py:1055
+#: ironic/drivers/base.py:1058
 msgid ""
 "Using periodic tasks with parallel=False is deprecated, \"parallel\" "
 "argument will be ignored starting with the Mitaka release"
@@ -231,6 +231,13 @@ msgstr ""
 msgid "Ignoring malformed capability '%s'. Format should be 'key:val'."
 msgstr ""
 
+#: ironic/drivers/modules/agent.py:151
+#, python-format
+msgid ""
+"Skip the image size check as memory_mb is not defined in properties on "
+"node %s."
+msgstr ""
+
 #: ironic/drivers/modules/agent_base_vendor.py:497
 #, python-format
 msgid "Malformed MAC: %s"
@@ -260,7 +267,7 @@ msgstr ""
 msgid "No console pid found for node %s while trying to stop shellinabox console."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:1039
+#: ironic/drivers/modules/deploy_utils.py:1055
 #, python-format
 msgid ""
 "ipmitool is unable to set boot device while the node %s is in UEFI boot "
@@ -353,12 +360,12 @@ msgid ""
 "%(cmd)s\". Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:793
-#: ironic/drivers/modules/iscsi_deploy.py:815
-#: ironic/drivers/modules/ilo/deploy.py:898
-#: ironic/drivers/modules/ilo/deploy.py:928
-#: ironic/drivers/modules/irmc/deploy.py:803
-#: ironic/drivers/modules/irmc/deploy.py:833
+#: ironic/drivers/modules/iscsi_deploy.py:792
+#: ironic/drivers/modules/iscsi_deploy.py:814
+#: ironic/drivers/modules/ilo/deploy.py:962
+#: ironic/drivers/modules/ilo/deploy.py:992
+#: ironic/drivers/modules/irmc/deploy.py:806
+#: ironic/drivers/modules/irmc/deploy.py:836
 #, python-format
 msgid ""
 "The node %s is using the bash deploy ramdisk for its deployment. This "
@@ -429,7 +436,7 @@ msgid ""
 " %(state)s."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:703
+#: ironic/drivers/modules/ssh.py:716
 #, python-format
 msgid ""
 "Failed to get boot device for node %(node)s, virt_type %(vtype)s does not"
@@ -468,7 +475,30 @@ msgid ""
 "%(response_code)s. Retry attempt %(count)d"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:403
+#: ironic/drivers/modules/ilo/deploy.py:91
+#, python-format
+msgid ""
+"Boot iso recreation failed during take over. Reason: %(reason)s. The node"
+" %(node)s may not come up with current boot_iso %(boot_iso)s. "
+msgstr ""
+
+#: ironic/drivers/modules/ilo/deploy.py:102
+#, python-format
+msgid ""
+"Boot iso recreation failed during take over. The node %(node)s may not "
+"come up with current boot_iso %(boot_iso)s. "
+msgstr ""
+
+#: ironic/drivers/modules/ilo/deploy.py:108
+#, python-format
+msgid ""
+"There is not enough information to recreate boot iso. The UUID for the "
+"root partition could not be found. The boot-iso cannot be created without"
+" root_uuid. The node %(node)s may not come up with current boot_iso "
+"%(boot_iso)s "
+msgstr ""
+
+#: ironic/drivers/modules/ilo/deploy.py:450
 #, python-format
 msgid "Secure boot mode is not supported for node %s"
 msgstr ""
diff --git a/ironic/locale/ironic.pot b/ironic/locale/ironic.pot
index ce8614742..7a8922f32 100644
--- a/ironic/locale/ironic.pot
+++ b/ironic/locale/ironic.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ironic 4.1.1.dev38\n"
+"Project-Id-Version: ironic 4.1.0.106.gecf6fc1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-09-17 06:25+0000\n"
+"POT-Creation-Date: 2015-09-24 21:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,47 +79,47 @@ msgid ""
 msgstr ""
 
 #: ironic/api/controllers/v1/chassis.py:177
-#: ironic/api/controllers/v1/node.py:883 ironic/api/controllers/v1/port.py:212
+#: ironic/api/controllers/v1/node.py:901 ironic/api/controllers/v1/port.py:212
 #, python-format
 msgid "The sort_key value %(key)s is an invalid field for sorting"
 msgstr ""
 
-#: ironic/api/controllers/v1/node.py:446 ironic/conductor/manager.py:696
+#: ironic/api/controllers/v1/node.py:452 ironic/conductor/manager.py:697
 msgid "provisioning"
 msgstr ""
 
-#: ironic/api/controllers/v1/node.py:468
+#: ironic/api/controllers/v1/node.py:474
 #, python-format
 msgid "Adding a config drive is only supported when setting provision state to %s"
 msgstr ""
 
-#: ironic/api/controllers/v1/node.py:495
+#: ironic/api/controllers/v1/node.py:500
 #, python-format
 msgid "The requested action \"%(action)s\" could not be understood."
 msgstr ""
 
-#: ironic/api/controllers/v1/node.py:871
+#: ironic/api/controllers/v1/node.py:889
 msgid "Chassis id not specified."
 msgstr ""
 
-#: ironic/api/controllers/v1/node.py:970
+#: ironic/api/controllers/v1/node.py:988
 #, python-format
 msgid ""
 "Node %s can not update the driver while the console is enabled. Please "
 "stop the console first."
 msgstr ""
 
-#: ironic/api/controllers/v1/node.py:1113
+#: ironic/api/controllers/v1/node.py:1131
 #, python-format
 msgid "Cannot create node with invalid name %(name)s"
 msgstr ""
 
-#: ironic/api/controllers/v1/node.py:1157
+#: ironic/api/controllers/v1/node.py:1175
 #, python-format
 msgid "Node %s can not be updated while a state transition is in progress."
 msgstr ""
 
-#: ironic/api/controllers/v1/node.py:1163
+#: ironic/api/controllers/v1/node.py:1181
 #, python-format
 msgid "Node %(node)s: Cannot change name to invalid name '%(name)s'"
 msgstr ""
@@ -533,260 +533,250 @@ msgstr ""
 
 #: ironic/common/exception.py:349
 #, python-format
-msgid "Unsupported object type %(objtype)s"
-msgstr ""
-
-#: ironic/common/exception.py:353
-#, python-format
-msgid "Cannot call %(method)s on orphaned %(objtype)s object"
-msgstr ""
-
-#: ironic/common/exception.py:357
-#, python-format
 msgid ""
 "Driver %(driver)s does not support %(extension)s (disabled or not "
 "implemented)."
 msgstr ""
 
-#: ironic/common/exception.py:362
-#, python-format
-msgid "Version %(objver)s of %(objname)s is not supported"
-msgstr ""
-
-#: ironic/common/exception.py:366
+#: ironic/common/exception.py:354
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: ironic/common/exception.py:371
+#: ironic/common/exception.py:359
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:363
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: ironic/common/exception.py:379
+#: ironic/common/exception.py:367
 #, python-format
 msgid "Validation of image href %(image_href)s failed, reason: %(reason)s"
 msgstr ""
 
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:372
 #, python-format
 msgid "Failed to download image %(image_href)s, reason: %(reason)s"
 msgstr ""
 
-#: ironic/common/exception.py:388
+#: ironic/common/exception.py:376
 msgid "Not authorized in Keystone."
 msgstr ""
 
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:384
 #, python-format
 msgid ""
 "Service type %(service_type)s with endpoint type %(endpoint_type)s not "
 "found in keystone service catalog."
 msgstr ""
 
-#: ironic/common/exception.py:401
+#: ironic/common/exception.py:389
 msgid "Connection failed"
 msgstr ""
 
-#: ironic/common/exception.py:405
+#: ironic/common/exception.py:393
 msgid "Requested OpenStack Images API is forbidden"
 msgstr ""
 
-#: ironic/common/exception.py:413
+#: ironic/common/exception.py:401
 msgid "The provided endpoint is invalid"
 msgstr ""
 
-#: ironic/common/exception.py:417
+#: ironic/common/exception.py:405
 msgid "Unable to communicate with the server."
 msgstr ""
 
-#: ironic/common/exception.py:433
+#: ironic/common/exception.py:421
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: ironic/common/exception.py:437
+#: ironic/common/exception.py:425
 #, python-format
 msgid ""
 "Node %(node)s is locked by host %(host)s, please retry after the current "
 "operation is completed."
 msgstr ""
 
-#: ironic/common/exception.py:442
+#: ironic/common/exception.py:430
 #, python-format
 msgid "Node %(node)s found not to be locked on release"
 msgstr ""
 
-#: ironic/common/exception.py:446
+#: ironic/common/exception.py:434
 msgid ""
 "Requested action cannot be performed due to lack of free conductor "
 "workers."
 msgstr ""
 
-#: ironic/common/exception.py:456
+#: ironic/common/exception.py:444
 #, python-format
 msgid "Invalid configuration file. %(error_msg)s"
 msgstr ""
 
-#: ironic/common/exception.py:460
+#: ironic/common/exception.py:448
 #, python-format
 msgid "Driver %(driver)s could not be loaded. Reason: %(reason)s."
 msgstr ""
 
-#: ironic/common/exception.py:468
+#: ironic/common/exception.py:456
 #, python-format
 msgid "Could not find pid in pid file %(pid_path)s"
 msgstr ""
 
-#: ironic/common/exception.py:472
+#: ironic/common/exception.py:460
 #, python-format
 msgid "Console subprocess failed to start. %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:476
+#: ironic/common/exception.py:464
 #, python-format
 msgid "Failed to create the password file. %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:484
+#: ironic/common/exception.py:472
 #, python-format
 msgid "%(operation)s failed, error: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:488
+#: ironic/common/exception.py:476
 #, python-format
 msgid "%(operation)s not supported. error: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:496
+#: ironic/common/exception.py:484
 #, python-format
 msgid ""
 "DRAC client failed. Last error (cURL error code): %(last_error)s, fault "
 "string: \"%(fault_string)s\" response_code: %(response_code)s"
 msgstr ""
 
-#: ironic/common/exception.py:503
+#: ironic/common/exception.py:491
 #, python-format
 msgid "DRAC operation failed. Message: %(message)s"
 msgstr ""
 
-#: ironic/common/exception.py:507
+#: ironic/common/exception.py:495
 #, python-format
 msgid ""
 "DRAC operation yielded return value %(actual_return_value)s that is "
 "neither error nor expected %(expected_return_value)s"
 msgstr ""
 
-#: ironic/common/exception.py:512
+#: ironic/common/exception.py:500
 #, python-format
 msgid ""
 "Another job with ID %(job_id)s is already created  to configure "
 "%(target)s. Wait until existing job is completed or is canceled"
 msgstr ""
 
-#: ironic/common/exception.py:518
+#: ironic/common/exception.py:506
 #, python-format
 msgid ""
 "Invalid filter dialect '%(invalid_filter)s'. Supported options are "
 "%(supported)s"
 msgstr ""
 
-#: ironic/common/exception.py:523
+#: ironic/common/exception.py:511
 #, python-format
 msgid "Failed to get sensor data for node %(node)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:528
+#: ironic/common/exception.py:516
 #, python-format
 msgid "Failed to parse sensor data for node %(node)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:533
+#: ironic/common/exception.py:521
 #, python-format
 msgid ""
 "Disk volume where '%(path)s' is located doesn't have enough disk space. "
 "Required %(required)d MiB, only %(actual)d MiB available space present."
 msgstr ""
 
-#: ironic/common/exception.py:539
+#: ironic/common/exception.py:527
 #, python-format
 msgid "Creating %(image_type)s image failed: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:543
+#: ironic/common/exception.py:531
 #, python-format
 msgid "Swift operation '%(operation)s' failed: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:547
+#: ironic/common/exception.py:535
 #, python-format
 msgid "SNMP operation '%(operation)s' failed: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:551
+#: ironic/common/exception.py:539
 #, python-format
 msgid "Failed to create a file system. File system %(fs)s is not supported."
 msgstr ""
 
-#: ironic/common/exception.py:556
+#: ironic/common/exception.py:544
 #, python-format
 msgid "iRMC %(operation)s failed. Reason: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:560
+#: ironic/common/exception.py:548
 #, python-format
 msgid "iRMC shared file system '%(share)s' is not mounted."
 msgstr ""
 
-#: ironic/common/exception.py:564
+#: ironic/common/exception.py:552
 #, python-format
 msgid "VirtualBox operation '%(operation)s' failed. Error: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:569
+#: ironic/common/exception.py:557
 #, python-format
 msgid "Failed to inspect hardware. Reason: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:573
+#: ironic/common/exception.py:561
 #, python-format
 msgid "Failed to clean node %(node)s: %(reason)s"
 msgstr ""
 
-#: ironic/common/exception.py:577
+#: ironic/common/exception.py:565
 #, python-format
 msgid "Path %(dir)s does not exist."
 msgstr ""
 
-#: ironic/common/exception.py:581
+#: ironic/common/exception.py:569
 #, python-format
 msgid "Directory %(dir)s is not writable."
 msgstr ""
 
-#: ironic/common/exception.py:585
+#: ironic/common/exception.py:573
 #, python-format
 msgid ""
 "Cisco UCS client: operation %(operation)s failed for node %(node)s. "
 "Reason: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:590
+#: ironic/common/exception.py:578
 #, python-format
 msgid "Cisco UCS client: connection failed for node %(node)s. Reason: %(error)s"
 msgstr ""
 
-#: ironic/common/exception.py:599
+#: ironic/common/exception.py:587
 #, python-format
 msgid ""
 "Failed to upload %(image_name)s image to web server %(web_server)s, "
 "reason: %(reason)s"
 msgstr ""
 
+#: ironic/common/exception.py:592
+#, python-format
+msgid "Cisco IMC exception occurred for node %(node)s: %(error)s"
+msgstr ""
+
 #: ironic/common/fsm.py:87
 #, python-format
 msgid "Target state '%s' does not exist"
@@ -1126,86 +1116,86 @@ msgid ""
 "swift_store_multiple_containers_seed."
 msgstr ""
 
-#: ironic/conductor/manager.py:88
+#: ironic/conductor/manager.py:89
 msgid ""
 "URL of Ironic API service. If not set ironic can get the current value "
 "from the keystone service catalog."
 msgstr ""
 
-#: ironic/conductor/manager.py:93
+#: ironic/conductor/manager.py:94
 msgid "Seconds between conductor heart beats."
 msgstr ""
 
-#: ironic/conductor/manager.py:96
+#: ironic/conductor/manager.py:97
 msgid ""
 "Maximum time (in seconds) since the last check-in of a conductor. A "
 "conductor is considered inactive when this time has been exceeded."
 msgstr ""
 
-#: ironic/conductor/manager.py:101
+#: ironic/conductor/manager.py:102
 msgid "Interval between syncing the node power state to the database, in seconds."
 msgstr ""
 
-#: ironic/conductor/manager.py:105
+#: ironic/conductor/manager.py:106
 msgid "Interval between checks of provision timeouts, in seconds."
 msgstr ""
 
-#: ironic/conductor/manager.py:109
+#: ironic/conductor/manager.py:110
 msgid ""
 "Timeout (seconds) to wait for a callback from a deploy ramdisk. Set to 0 "
 "to disable timeout."
 msgstr ""
 
-#: ironic/conductor/manager.py:113
+#: ironic/conductor/manager.py:114
 msgid ""
 "During sync_power_state, should the hardware power state be set to the "
 "state recorded in the database (True) or should the database be updated "
 "based on the hardware state (False)."
 msgstr ""
 
-#: ironic/conductor/manager.py:119
+#: ironic/conductor/manager.py:120
 msgid ""
 "During sync_power_state failures, limit the number of times Ironic should"
 " try syncing the hardware node power state with the node power state in "
 "DB"
 msgstr ""
 
-#: ironic/conductor/manager.py:125
+#: ironic/conductor/manager.py:126
 msgid ""
 "Maximum number of worker threads that can be started simultaneously by a "
 "periodic task. Should be less than RPC thread pool size."
 msgstr ""
 
-#: ironic/conductor/manager.py:130
+#: ironic/conductor/manager.py:131
 msgid "The size of the workers greenthread pool."
 msgstr ""
 
-#: ironic/conductor/manager.py:133
+#: ironic/conductor/manager.py:134
 msgid "Number of attempts to grab a node lock."
 msgstr ""
 
-#: ironic/conductor/manager.py:136
+#: ironic/conductor/manager.py:137
 msgid "Seconds to sleep between node lock attempts."
 msgstr ""
 
-#: ironic/conductor/manager.py:139
+#: ironic/conductor/manager.py:140
 msgid "Enable sending sensor data message via the notification bus"
 msgstr ""
 
-#: ironic/conductor/manager.py:143
+#: ironic/conductor/manager.py:144
 msgid ""
 "Seconds between conductor sending sensor data message to ceilometer via "
 "the notification bus."
 msgstr ""
 
-#: ironic/conductor/manager.py:147
+#: ironic/conductor/manager.py:148
 msgid ""
 "List of comma separated meter types which need to be sent to Ceilometer. "
 "The default value, \"ALL\", is a special value meaning send all the "
 "sensor data."
 msgstr ""
 
-#: ironic/conductor/manager.py:152
+#: ironic/conductor/manager.py:153
 msgid ""
 "When conductors join or leave the cluster, existing conductors may need "
 "to update any persistent local state as nodes are moved around the "
@@ -1214,21 +1204,21 @@ msgid ""
 "to disable the check entirely."
 msgstr ""
 
-#: ironic/conductor/manager.py:161
+#: ironic/conductor/manager.py:162
 msgid "Whether to upload the config drive to Swift."
 msgstr ""
 
-#: ironic/conductor/manager.py:164
+#: ironic/conductor/manager.py:165
 msgid ""
 "Name of the Swift container to store config drive data. Used when "
 "configdrive_use_swift is True."
 msgstr ""
 
-#: ironic/conductor/manager.py:168
+#: ironic/conductor/manager.py:169
 msgid "Timeout (seconds) for waiting for node inspection. 0 - unlimited."
 msgstr ""
 
-#: ironic/conductor/manager.py:172
+#: ironic/conductor/manager.py:173
 msgid ""
 "Cleaning is a configurable set of steps, such as erasing disk drives, "
 "that are performed on the node to ensure it is in a baseline state and "
@@ -1242,110 +1232,132 @@ msgid ""
 "could be safely disabled."
 msgstr ""
 
-#: ironic/conductor/manager.py:189
+#: ironic/conductor/manager.py:190
 msgid ""
 "Timeout (seconds) to wait for a callback from the ramdisk doing the "
 "cleaning. If the timeout is reached the node will be put in the \"clean "
 "failed\" provision state. Set to 0 to disable timeout."
 msgstr ""
 
-#: ironic/conductor/manager.py:306
+#: ironic/conductor/manager.py:307
 #, python-format
 msgid "The deployment can't be resumed by conductor %s. Moving to fail state."
 msgstr ""
 
-#: ironic/conductor/manager.py:509 ironic/conductor/manager.py:589
+#: ironic/conductor/manager.py:510 ironic/conductor/manager.py:590
 #: ironic/drivers/utils.py:86
 #, python-format
 msgid "No handler for method %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:514 ironic/conductor/manager.py:594
+#: ironic/conductor/manager.py:515 ironic/conductor/manager.py:595
 #, python-format
 msgid "The method %(method)s does not support HTTP %(http)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:731
+#: ironic/conductor/manager.py:732
 #, python-format
 msgid "RPC do_node_deploy failed to validate deploy or power info. Error: %(msg)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:779
+#: ironic/conductor/manager.py:780
 #, python-format
 msgid ""
 "Failed to validate power driver interface. Can not delete instance. "
 "Error: %(msg)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:804
+#: ironic/conductor/manager.py:805
 #, python-format
 msgid "Failed to tear down. Error: %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:859
+#: ironic/conductor/manager.py:852
+#, python-format
+msgid "Node %(node)s got an invalid last step for %(state)s: %(step)s."
+msgstr ""
+
+#: ironic/conductor/manager.py:890
 #, python-format
 msgid ""
 "Cannot continue cleaning on %(node)s, node is in %(state)s state, should "
 "be %(clean_state)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:902
+#: ironic/conductor/manager.py:930
+msgid "Failed to run next clean step"
+msgstr ""
+
+#: ironic/conductor/manager.py:957
 #, python-format
 msgid ""
 "Failed to validate power driver interface. Can not clean node %(node)s. "
 "Error: %(msg)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:912
+#: ironic/conductor/manager.py:967
 #, python-format
 msgid "Failed to prepare node %(node)s for cleaning: %(e)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:954
-#, python-format
-msgid "Node %(node)s got an invalid last step for %(state)s: %(step)s."
-msgstr ""
-
-#: ironic/conductor/manager.py:976
+#: ironic/conductor/manager.py:1015
 #, python-format
 msgid "Node %(node)s failed step %(step)s: %(exc)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1004
+#: ironic/conductor/manager.py:1043
 #, python-format
 msgid ""
 "While executing step %(step)s on node %(node)s, step returned invalid "
 "value: %(val)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1020
+#: ironic/conductor/manager.py:1059
 #, python-format
 msgid "Failed to tear down from cleaning for node %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1038
+#: ironic/conductor/manager.py:1077
 #, python-format
 msgid ""
 "Failed to validate power driver interface for node %(node)s. Error: "
 "%(msg)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1045
+#: ironic/conductor/manager.py:1084
 #, python-format
 msgid "Failed to get power state for node %(node)s. Error: %(msg)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1281
+#: ironic/conductor/manager.py:1111
+msgid "Failed to tear down cleaning after aborting the operation"
+msgstr ""
+
+#: ironic/conductor/manager.py:1117
+#, python-format
+msgid "Clean operation aborted for node %s"
+msgstr ""
+
+#: ironic/conductor/manager.py:1118
+msgid "By request, the clean operation was aborted"
+msgstr ""
+
+#: ironic/conductor/manager.py:1120
+#, python-format
+msgid " after the completion of step \"%s\""
+msgstr ""
+
+#: ironic/conductor/manager.py:1386
 msgid ""
 "Timeout reached while cleaning the node. Please check if the ramdisk "
 "responsible for the cleaning is running on the node."
 msgstr ""
 
-#: ironic/conductor/manager.py:1409
+#: ironic/conductor/manager.py:1514
 msgid "not supported"
 msgstr ""
 
-#: ironic/conductor/manager.py:1454
+#: ironic/conductor/manager.py:1559
 #, python-format
 msgid ""
 "Can not delete node \"%(node)s\" while it is in provision state "
@@ -1353,58 +1365,58 @@ msgid ""
 "\"%(valid_states)s\""
 msgstr ""
 
-#: ironic/conductor/manager.py:1561
+#: ironic/conductor/manager.py:1666
 msgid "enabled"
 msgstr ""
 
-#: ironic/conductor/manager.py:1561
+#: ironic/conductor/manager.py:1666
 msgid "disabled"
 msgstr ""
 
-#: ironic/conductor/manager.py:1584
+#: ironic/conductor/manager.py:1689
 msgid "enabling"
 msgstr ""
 
-#: ironic/conductor/manager.py:1584
+#: ironic/conductor/manager.py:1689
 msgid "disabling"
 msgstr ""
 
-#: ironic/conductor/manager.py:1585
+#: ironic/conductor/manager.py:1690
 #, python-format
 msgid "Error %(op)s the console on node %(node)s. Reason: %(error)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1878
+#: ironic/conductor/manager.py:1983
 #, python-format
 msgid ""
 "RPC inspect_hardware failed to validate inspection or power info. Error: "
 "%(msg)s"
 msgstr ""
 
-#: ironic/conductor/manager.py:1910
+#: ironic/conductor/manager.py:2015
 msgid "timeout reached while inspecting the node"
 msgstr ""
 
-#: ironic/conductor/manager.py:2056 ironic/conductor/manager.py:2084
+#: ironic/conductor/manager.py:2266 ironic/conductor/manager.py:2294
 msgid "No free conductor workers available"
 msgstr ""
 
-#: ironic/conductor/manager.py:2157
+#: ironic/conductor/manager.py:2367
 #, python-format
 msgid "Failed to upload the configdrive to Swift. Error: %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:2168
+#: ironic/conductor/manager.py:2378
 #, python-format
 msgid "Failed to prepare to deploy. Error: %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:2177
+#: ironic/conductor/manager.py:2387
 #, python-format
 msgid "Failed to deploy. Error: %s"
 msgstr ""
 
-#: ironic/conductor/manager.py:2214
+#: ironic/conductor/manager.py:2424
 #, python-format
 msgid ""
 "During sync_power_state, max retries exceeded for node %(node)s, node "
@@ -1412,20 +1424,25 @@ msgid ""
 "state to '%(actual)s' Switching node to maintenance mode."
 msgstr ""
 
-#: ironic/conductor/manager.py:2262
+#: ironic/conductor/manager.py:2472
 msgid "Power driver returned ERROR state while trying to sync power state."
 msgstr ""
 
-#: ironic/conductor/manager.py:2369
+#: ironic/conductor/manager.py:2579
 #, python-format
 msgid "During inspection, driver returned unexpected state %(state)s"
 msgstr ""
 
-#: ironic/conductor/rpcapi.py:114
+#: ironic/conductor/rpcapi.py:117
 #, python-format
 msgid "No conductor service registered which supports driver %s."
 msgstr ""
 
+#: ironic/conductor/rpcapi.py:614 ironic/conductor/rpcapi.py:638
+#: ironic/conductor/rpcapi.py:661
+msgid "Incompatible conductor version - please upgrade ironic-conductor first"
+msgstr ""
+
 #: ironic/conductor/utils.py:71 ironic/conductor/utils.py:118
 #, python-format
 msgid "Failed to change power state to '%(target)s'. Error: %(error)s"
@@ -1538,48 +1555,53 @@ msgid ""
 "possible network issue. %(exc)s"
 msgstr ""
 
-#: ironic/drivers/agent.py:121 ironic/drivers/fake.py:217
-#: ironic/drivers/pxe.py:264
+#: ironic/drivers/agent.py:132 ironic/drivers/fake.py:219
+#: ironic/drivers/pxe.py:277
 msgid "Unable to import pyremotevbox library"
 msgstr ""
 
-#: ironic/drivers/agent.py:145 ironic/drivers/fake.py:267
-#: ironic/drivers/pxe.py:324
+#: ironic/drivers/agent.py:156 ironic/drivers/fake.py:269
+#: ironic/drivers/pxe.py:337
 msgid "Unable to import UcsSdk library"
 msgstr ""
 
-#: ironic/drivers/drac.py:38 ironic/drivers/fake.py:178
-#: ironic/drivers/fake.py:245 ironic/drivers/pxe.py:285
+#: ironic/drivers/agent.py:179 ironic/drivers/fake.py:282
+#: ironic/drivers/pxe.py:359
+msgid "Unable to import ImcSdk library"
+msgstr ""
+
+#: ironic/drivers/drac.py:38 ironic/drivers/fake.py:180
+#: ironic/drivers/fake.py:247 ironic/drivers/pxe.py:298
 msgid "Unable to import pywsman library"
 msgstr ""
 
-#: ironic/drivers/fake.py:111
+#: ironic/drivers/fake.py:113
 msgid "Unable to import pyghmi IPMI library"
 msgstr ""
 
-#: ironic/drivers/fake.py:126 ironic/drivers/pxe.py:144
+#: ironic/drivers/fake.py:128 ironic/drivers/pxe.py:157
 msgid "Unable to import seamicroclient library"
 msgstr ""
 
-#: ironic/drivers/fake.py:152 ironic/drivers/pxe.py:172
+#: ironic/drivers/fake.py:154 ironic/drivers/pxe.py:185
 msgid "Unable to import iboot library"
 msgstr ""
 
-#: ironic/drivers/fake.py:164 ironic/drivers/ilo.py:44 ironic/drivers/ilo.py:68
-#: ironic/drivers/pxe.py:192
+#: ironic/drivers/fake.py:166 ironic/drivers/ilo.py:44 ironic/drivers/ilo.py:68
+#: ironic/drivers/pxe.py:205
 msgid "Unable to import proliantutils library"
 msgstr ""
 
-#: ironic/drivers/fake.py:192 ironic/drivers/pxe.py:216
+#: ironic/drivers/fake.py:194 ironic/drivers/pxe.py:229
 msgid "Unable to import pysnmp library"
 msgstr ""
 
-#: ironic/drivers/fake.py:204 ironic/drivers/irmc.py:45
-#: ironic/drivers/irmc.py:68 ironic/drivers/pxe.py:239
+#: ironic/drivers/fake.py:206 ironic/drivers/irmc.py:44
+#: ironic/drivers/irmc.py:67 ironic/drivers/pxe.py:252
 msgid "Unable to import python-scciclient library"
 msgstr ""
 
-#: ironic/drivers/pxe.py:119
+#: ironic/drivers/pxe.py:121
 msgid "Unable to import pyghmi library"
 msgstr ""
 
@@ -1587,103 +1609,101 @@ msgstr ""
 msgid "Method not specified when calling vendor extension."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:43
+#: ironic/drivers/modules/agent.py:44
 msgid ""
 "DEPRECATED. Additional append parameters for baremetal PXE boot. This "
 "option is deprecated and will be removed in Mitaka release. Please use "
 "[pxe]pxe_append_params instead."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:50
+#: ironic/drivers/modules/agent.py:51
 msgid ""
 "DEPRECATED. Template file for PXE configuration. This option is "
 "deprecated and will be removed in Mitaka release. Please use "
 "[pxe]pxe_config_template instead."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:55
-msgid ""
-"Priority to run in-band erase devices via the Ironic Python Agent "
-"ramdisk. If unset, will use the priority set in the ramdisk (defaults to "
-"10 for the GenericHardwareManager). If set to 0, will not run during "
-"cleaning."
-msgstr ""
-
-#: ironic/drivers/modules/agent.py:62
-msgid "Number of iterations to be run for erasing devices."
-msgstr ""
-
-#: ironic/drivers/modules/agent.py:67
+#: ironic/drivers/modules/agent.py:59
 msgid ""
 "Whether Ironic will manage booting of the agent ramdisk. If set to False,"
 " you will need to configure your mechanism to allow booting the agent "
 "ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:81 ironic/drivers/modules/pxe.py:91
+#: ironic/drivers/modules/agent.py:65
+msgid ""
+"The memory size in MiB consumed by agent when it is booted on a bare "
+"metal node. This is used for checking if the image can be downloaded and "
+"deployed on the bare metal node after booting agent ramdisk. This may be "
+"set according to the memory consumed by the agent ramdisk image."
+msgstr ""
+
+#: ironic/drivers/modules/agent.py:83 ironic/drivers/modules/pxe.py:91
 msgid "UUID (from Glance) of the deployment kernel. Required."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:83
+#: ironic/drivers/modules/agent.py:85
 msgid ""
 "UUID (from Glance) of the ramdisk with agent that is used at deploy time."
 " Required."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:187
+#: ironic/drivers/modules/agent.py:159
+#, python-format
+msgid ""
+"Memory size is too small for requested image, if it is less than (image "
+"size + reserved RAM size), will break the IPA deployments. Image size: "
+"%(image_size)d MiB, Memory size: %(memory_size)d MiB, Reserved size: "
+"%(reserved_size)d MiB."
+msgstr ""
+
+#: ironic/drivers/modules/agent.py:200
 #, python-format
 msgid "Node %s failed to validate deploy image info. Some parameters were missing"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:193
+#: ironic/drivers/modules/agent.py:206
 #, python-format
 msgid ""
 "image_source's image_checksum must be provided in instance_info for node "
 "%s"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:201
+#: ironic/drivers/modules/agent.py:215
 #, python-format
 msgid ""
 "Node %(node)s is configured to use the %(driver)s driver which currently "
 "does not support deploying partition images."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:337
-#, python-format
-msgid ""
-"When creating cleaning ports, DHCP provider didn't return VIF port ID for"
-" %s"
-msgstr ""
-
-#: ironic/drivers/modules/agent.py:450
+#: ironic/drivers/modules/agent.py:411
 #, python-format
 msgid "node %(node)s command status errored: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:511
+#: ironic/drivers/modules/agent.py:472
 #, python-format
 msgid "Node %s has no target RAID configuration."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:521
+#: ironic/drivers/modules/agent.py:481
 msgid "skipping root volume"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:524
+#: ironic/drivers/modules/agent.py:484
 msgid "skipping non-root volumes"
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:531
+#: ironic/drivers/modules/agent.py:491
 msgid " and "
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:533
+#: ironic/drivers/modules/agent.py:493
 #, python-format
 msgid "Node %(node)s has empty target RAID configuration after %(msg)s."
 msgstr ""
 
-#: ironic/drivers/modules/agent.py:569
+#: ironic/drivers/modules/agent.py:529
 #, python-format
 msgid ""
 "Agent ramdisk didn't return a proper command result while cleaning "
@@ -1877,147 +1897,166 @@ msgstr ""
 msgid "Could not stop the console for node '%(node)s'. Reason: %(err)s."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:59
+#: ironic/drivers/modules/deploy_utils.py:61
 msgid ""
 "Size of EFI system partition in MiB when configuring UEFI systems for "
 "local boot."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:63
+#: ironic/drivers/modules/deploy_utils.py:65
 msgid "Block size to use when writing to the nodes disk."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:66
+#: ironic/drivers/modules/deploy_utils.py:68
 msgid ""
 "Maximum attempts to verify an iSCSI connection is active, sleeping 1 "
 "second between attempts."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:145
+#: ironic/drivers/modules/deploy_utils.py:83
+msgid ""
+"Priority to run in-band erase devices via the Ironic Python Agent "
+"ramdisk. If unset, will use the priority set in the ramdisk (defaults to "
+"10 for the GenericHardwareManager). If set to 0, will not run during "
+"cleaning."
+msgstr ""
+
+#: ironic/drivers/modules/deploy_utils.py:92
+msgid "Number of iterations to be run for erasing devices."
+msgstr ""
+
+#: ironic/drivers/modules/deploy_utils.py:162
 #, python-format
 msgid ""
 "iSCSI connection was not seen by the file system after attempting to "
 "verify %d times."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:169
+#: ironic/drivers/modules/deploy_utils.py:186
 #, python-format
 msgid ""
 "iSCSI connection did not become active after attempting to verify %d "
 "times."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:327
+#: ironic/drivers/modules/deploy_utils.py:344
 #, python-format
 msgid ""
 "Unable to stat device %(dev)s after attempting to verify %(attempts)d "
 "times."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:526
+#: ironic/drivers/modules/deploy_utils.py:543
 #, python-format
 msgid ""
 "Can't download the configdrive content for node %(node)s from '%(url)s'. "
 "Reason: %(reason)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:535
+#: ironic/drivers/modules/deploy_utils.py:552
 #, python-format
 msgid ""
 "Config drive for node %s is not base64 encoded or the content is "
 "malformed."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:538
+#: ironic/drivers/modules/deploy_utils.py:555
 #, python-format
 msgid " Downloaded from \"%s\"."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:552
+#: ironic/drivers/modules/deploy_utils.py:569
 #, python-format
 msgid ""
 "Encountered error while decompressing and writing config drive for node "
 "%(node)s. Error: %(exc)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:627
+#: ironic/drivers/modules/deploy_utils.py:644
 #, python-format
 msgid "Root device '%s' not found"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:637
+#: ironic/drivers/modules/deploy_utils.py:654
 #, python-format
 msgid "'%(partition)s' device '%(part_device)s' not found"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:729
-#: ironic/drivers/modules/iscsi_deploy.py:246
+#: ironic/drivers/modules/deploy_utils.py:746
+#: ironic/drivers/modules/iscsi_deploy.py:245
 #, python-format
 msgid ""
 "Root partition is too small for requested image. Image virtual size: "
 "%(image_mb)d MB, Root size: %(root_mb)d MB"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:779
+#: ironic/drivers/modules/deploy_utils.py:796
 #, python-format
 msgid "Parent device '%s' not found"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:830
+#: ironic/drivers/modules/deploy_utils.py:847
 #, python-format
 msgid "%(error_msg)s. Missing are: %(missing_info)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:924
+#: ironic/drivers/modules/deploy_utils.py:941
 #, python-format
 msgid ""
 "Error parsing capabilities from Node %s instance_info field. A dictionary"
 " or a \"jsonified\" dictionary is expected."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:958
+#: ironic/drivers/modules/deploy_utils.py:975
 #, python-format
 msgid "get_clean_steps for node %(node)s returned invalid result: %(result)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:994
+#: ironic/drivers/modules/deploy_utils.py:1011
 #, python-format
 msgid "Agent on node %(node)s returned bad command result: %(result)s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:1067
+#: ironic/drivers/modules/deploy_utils.py:1083
 #, python-format
 msgid ""
 "The hints \"%(invalid_hints)s\" are invalid. Valid hints are: "
 "\"%(valid_hints)s\""
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:1077
+#: ironic/drivers/modules/deploy_utils.py:1093
 msgid "Root device hint \"size\" is not an integer value."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:1181
+#: ironic/drivers/modules/deploy_utils.py:1197
 #, python-format
 msgid ""
 "The parameter '%(capability)s' from %(field)s has an invalid value: "
 "'%(value)s'. Acceptable values are: %(valid_values)s."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:1233
+#: ironic/drivers/modules/deploy_utils.py:1249
 #, python-format
 msgid "Failed to connect to Glance to get the properties of the image %s"
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:1237
+#: ironic/drivers/modules/deploy_utils.py:1253
 #, python-format
 msgid "Image %s can not be found."
 msgstr ""
 
-#: ironic/drivers/modules/deploy_utils.py:1249
+#: ironic/drivers/modules/deploy_utils.py:1265
 #, python-format
 msgid "Image %(image)s is missing the following properties: %(properties)s"
 msgstr ""
 
+#: ironic/drivers/modules/deploy_utils.py:1317
+#, python-format
+msgid ""
+"When creating cleaning ports, DHCP provider didn't return VIF port ID for"
+" %s"
+msgstr ""
+
 #: ironic/drivers/modules/fake.py:49
 #, python-format
 msgid "set_power_state called with an invalid powerstate: %s."
@@ -2046,7 +2085,7 @@ msgstr ""
 
 #: ironic/drivers/modules/fake.py:186 ironic/drivers/modules/ipminative.py:468
 #: ironic/drivers/modules/ipmitool.py:834
-#: ironic/drivers/modules/seamicro.py:573 ironic/drivers/modules/ssh.py:659
+#: ironic/drivers/modules/seamicro.py:573 ironic/drivers/modules/ssh.py:672
 #: ironic/drivers/modules/virtualbox.py:341
 #: ironic/drivers/modules/ilo/management.py:203
 #: ironic/drivers/modules/irmc/management.py:146
@@ -2096,7 +2135,7 @@ msgid "iBoot PDU port must be an integer."
 msgstr ""
 
 #: ironic/drivers/modules/iboot.py:238 ironic/drivers/modules/ipmitool.py:750
-#: ironic/drivers/modules/snmp.py:701 ironic/drivers/modules/ssh.py:575
+#: ironic/drivers/modules/snmp.py:701 ironic/drivers/modules/ssh.py:588
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -2384,142 +2423,142 @@ msgid ""
 "'ipmi_protocol_version' parameter in node's driver_info"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:51
+#: ironic/drivers/modules/iscsi_deploy.py:50
 msgid "Additional append parameters for baremetal PXE boot."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:54
+#: ironic/drivers/modules/iscsi_deploy.py:53
 msgid "Default file system format for ephemeral partition, if one is created."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:58
+#: ironic/drivers/modules/iscsi_deploy.py:57
 msgid "On the ironic-conductor node, directory where images are stored on disk."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:62
+#: ironic/drivers/modules/iscsi_deploy.py:61
 msgid ""
 "On the ironic-conductor node, directory where master instance images are "
 "stored on disk."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:66
+#: ironic/drivers/modules/iscsi_deploy.py:65
 msgid "Maximum size (in MiB) of cache for master images, including those in use."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:72
+#: ironic/drivers/modules/iscsi_deploy.py:71
 msgid "Maximum TTL (in minutes) for old master images in cache."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:76
+#: ironic/drivers/modules/iscsi_deploy.py:75
 msgid "The disk devices to scan while doing the deploy."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:128
+#: ironic/drivers/modules/iscsi_deploy.py:127
 #, python-format
 msgid ""
 " Deployed value of %(param)s was %(param_value)s but requested value is "
 "%(request_value)s."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:134
+#: ironic/drivers/modules/iscsi_deploy.py:133
 #, python-format
 msgid ""
 "The following parameters have different values from previous "
 "deployment:%(error_msg)s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:185
+#: ironic/drivers/modules/iscsi_deploy.py:184
 msgid ""
 "Cannot validate iSCSI deploy. Some parameters were missing in node's "
 "instance_info"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:194
+#: ironic/drivers/modules/iscsi_deploy.py:193
 #, python-format
 msgid ""
 "Cannot validate parameter for iSCSI deploy. Invalid parameter %(param)s. "
 "Reason: %(reason)s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:200
+#: ironic/drivers/modules/iscsi_deploy.py:199
 #, python-format
 msgid "%s is not an integer value."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:207
+#: ironic/drivers/modules/iscsi_deploy.py:206
 msgid "Cannot deploy whole disk image with swap or ephemeral size set"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:300
+#: ironic/drivers/modules/iscsi_deploy.py:299
 msgid "Deploy key does not match"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:322
+#: ironic/drivers/modules/iscsi_deploy.py:321
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:368
+#: ironic/drivers/modules/iscsi_deploy.py:367
 #, python-format
 msgid "Error returned from deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:389
+#: ironic/drivers/modules/iscsi_deploy.py:388
 #, python-format
 msgid "Deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:397
+#: ironic/drivers/modules/iscsi_deploy.py:396
 #, python-format
 msgid ""
 "Couldn't determine the UUID of the root partition or the disk identifier "
 "after deploying node %s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:440
+#: ironic/drivers/modules/iscsi_deploy.py:439
 #, python-format
 msgid ""
 "Failed to start the iSCSI target to deploy the node %(node)s. Error: "
 "%(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:551
+#: ironic/drivers/modules/iscsi_deploy.py:550
 #, python-format
 msgid ""
 "Couldn't get the URL of the Ironic API service from the configuration "
 "file or keystone catalog. Keystone error: %s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:575
+#: ironic/drivers/modules/iscsi_deploy.py:574
 msgid ""
 "Some mandatory input missing in 'pass_bootloader_info' vendor passthru "
 "from ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:582
+#: ironic/drivers/modules/iscsi_deploy.py:581
 #, python-format
 msgid "Deploy key %(key_sent)s does not match with %(expected_key)s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:601
+#: ironic/drivers/modules/iscsi_deploy.py:600
 #, python-format
 msgid "Failed to install bootloader on node %(node)s. Error: %(error)s."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:628
+#: ironic/drivers/modules/iscsi_deploy.py:627
 #, python-format
 msgid ""
 "Failed to notify ramdisk to reboot after bootloader installation. Error: "
 "%s"
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:851
-#: ironic/drivers/modules/ilo/deploy.py:967
-#: ironic/drivers/modules/irmc/deploy.py:871
+#: ironic/drivers/modules/iscsi_deploy.py:850
+#: ironic/drivers/modules/ilo/deploy.py:1035
+#: ironic/drivers/modules/irmc/deploy.py:874
 msgid "Failed to continue iSCSI deployment."
 msgstr ""
 
-#: ironic/drivers/modules/iscsi_deploy.py:890
+#: ironic/drivers/modules/iscsi_deploy.py:889
 msgid "Failed to continue agent deployment."
 msgstr ""
 
@@ -2596,7 +2635,7 @@ msgid ""
 "caused by enable secure boot."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:415 ironic/drivers/modules/ssh.py:521
+#: ironic/drivers/modules/pxe.py:415 ironic/drivers/modules/ssh.py:534
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -2796,34 +2835,34 @@ msgstr ""
 msgid "SSHPowerDriver '%(virt_type)s' is not a valid virt_type."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:208
+#: ironic/drivers/modules/ssh.py:222
 #, python-format
 msgid "SSHPowerDriver '%(virt_type)s' is not a valid virt_type, "
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:299
+#: ironic/drivers/modules/ssh.py:313
 #, python-format
 msgid ""
 "SSHPowerDriver requires the following parameters to be set in node's "
 "driver_info: %s."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:309
+#: ironic/drivers/modules/ssh.py:323
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:330
+#: ironic/drivers/modules/ssh.py:344
 msgid ""
 "SSHPowerDriver requires one and only one of password, key_contents and "
 "key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:339
+#: ironic/drivers/modules/ssh.py:353
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:526
+#: ironic/drivers/modules/ssh.py:539
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -2955,6 +2994,41 @@ msgstr ""
 msgid "Unsupported target_state: %s"
 msgstr ""
 
+#: ironic/drivers/modules/cimc/common.py:25
+msgid "IP or Hostname of the CIMC. Required."
+msgstr ""
+
+#: ironic/drivers/modules/cimc/common.py:26
+msgid "CIMC Manager admin username. Required."
+msgstr ""
+
+#: ironic/drivers/modules/cimc/common.py:27
+msgid "CIMC Manager password. Required."
+msgstr ""
+
+#: ironic/drivers/modules/cimc/common.py:48
+#: ironic/drivers/modules/ucs/helper.py:80
+#, python-format
+msgid "%s driver requires these parameters to be set in the node's driver_info."
+msgstr ""
+
+#: ironic/drivers/modules/cimc/power.py:32
+#: ironic/drivers/modules/ilo/power.py:40
+#: ironic/drivers/modules/ucs/power.py:39
+msgid "Number of times a power operation needs to be retried"
+msgstr ""
+
+#: ironic/drivers/modules/cimc/power.py:36
+#: ironic/drivers/modules/ilo/power.py:44
+#: ironic/drivers/modules/ucs/power.py:43
+msgid "Amount of time in seconds to wait in between power operations"
+msgstr ""
+
+#: ironic/drivers/modules/cimc/power.py:145
+#, python-format
+msgid "set_power_state called for %(node)s with invalid state %(state)s"
+msgstr ""
+
 #: ironic/drivers/modules/drac/bios.py:73
 #, python-format
 msgid "Item has no name: \"%s\""
@@ -3160,24 +3234,24 @@ msgstr ""
 msgid "UUID (from Glance) of the deployment ISO. Required."
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:234
+#: ironic/drivers/modules/ilo/deploy.py:281
 msgid ""
 "Error validating iLO virtual media deploy. Some parameters were missing "
 "in node's driver_info"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:747
+#: ironic/drivers/modules/ilo/deploy.py:811
 msgid "Missing 'console_port' parameter in node's driver_info."
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:825
+#: ironic/drivers/modules/ilo/deploy.py:889
 #, python-format
 msgid ""
 "The requested action 'boot_into_iso' can be performed only when node "
 "%(node_uuid)s is in %(state)s state or in 'maintenance' mode"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/deploy.py:832
+#: ironic/drivers/modules/ilo/deploy.py:896
 msgid ""
 "Error validating input for boot_into_iso vendor passthru. Some parameters"
 " were not provided: "
@@ -3262,16 +3336,6 @@ msgstr ""
 msgid "Setting %s as boot device"
 msgstr ""
 
-#: ironic/drivers/modules/ilo/power.py:40
-#: ironic/drivers/modules/ucs/power.py:39
-msgid "Number of times a power operation needs to be retried"
-msgstr ""
-
-#: ironic/drivers/modules/ilo/power.py:44
-#: ironic/drivers/modules/ucs/power.py:43
-msgid "Amount of time in seconds to wait in between power operations"
-msgstr ""
-
 #: ironic/drivers/modules/ilo/power.py:98
 msgid "iLO get_power_status"
 msgstr ""
@@ -3411,19 +3475,19 @@ msgstr ""
 msgid "Copying floppy image file"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:437
+#: ironic/drivers/modules/irmc/deploy.py:440
 msgid "Inserting virtual cdrom"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:460
+#: ironic/drivers/modules/irmc/deploy.py:463
 msgid "Ejecting virtual cdrom"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:493
+#: ironic/drivers/modules/irmc/deploy.py:496
 msgid "Inserting virtual floppy"
 msgstr ""
 
-#: ironic/drivers/modules/irmc/deploy.py:516
+#: ironic/drivers/modules/irmc/deploy.py:519
 msgid "Ejecting virtual floppy"
 msgstr ""
 
@@ -3486,27 +3550,22 @@ msgstr ""
 msgid "Operation failed: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ucs/helper.py:35
+#: ironic/drivers/modules/ucs/helper.py:34
 msgid "IP or Hostname of the UCS Manager. Required."
 msgstr ""
 
-#: ironic/drivers/modules/ucs/helper.py:36
+#: ironic/drivers/modules/ucs/helper.py:35
 msgid "UCS Manager admin/server-profile username. Required."
 msgstr ""
 
-#: ironic/drivers/modules/ucs/helper.py:37
+#: ironic/drivers/modules/ucs/helper.py:36
 msgid "UCS Manager password. Required."
 msgstr ""
 
-#: ironic/drivers/modules/ucs/helper.py:38
+#: ironic/drivers/modules/ucs/helper.py:37
 msgid "UCS Manager service-profile name. Required."
 msgstr ""
 
-#: ironic/drivers/modules/ucs/helper.py:81
-#, python-format
-msgid "%s driver requires these parameters to be set in the node's driver_info."
-msgstr ""
-
 #: ironic/drivers/modules/ucs/management.py:99
 msgid "setting boot device"
 msgstr ""
@@ -3532,25 +3591,7 @@ msgstr ""
 msgid "rebooting"
 msgstr ""
 
-#: ironic/objects/base.py:109
-msgid "Invalid version string"
-msgstr ""
-
-#: ironic/objects/base.py:301
-#, python-format
-msgid "Cannot load '%(attrname)s' in the base class"
-msgstr ""
-
-#: ironic/objects/base.py:310
-msgid "Cannot save anything in the base class"
-msgstr ""
-
-#: ironic/objects/base.py:342
-#, python-format
-msgid "%(objname)s object has no attribute '%(attrname)s'"
-msgstr ""
-
-#: ironic/objects/conductor.py:57
+#: ironic/objects/conductor.py:63
 msgid "Cannot update a conductor record directly."
 msgstr ""