Imported Translations from Transifex

Change-Id: If69eb05fc679aa1466bd185d5308338e6673415c

66 files changed, 2914 insertions, 3223 deletions

diff --git a/ironic/locale/ar/LC_MESSAGES/ironic.po b/ironic/locale/ar/LC_MESSAGES/ironic.po
index 947e84015..9c2679116 100644
--- a/ironic/locale/ar/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ar/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Arabic "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/bg_BG/LC_MESSAGES/ironic.po b/ironic/locale/bg_BG/LC_MESSAGES/ironic.po
index 098283a02..7605773e7 100644
--- a/ironic/locale/bg_BG/LC_MESSAGES/ironic.po
+++ b/ironic/locale/bg_BG/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/bn_IN/LC_MESSAGES/ironic.po b/ironic/locale/bn_IN/LC_MESSAGES/ironic.po
index 27358c617..042d35839 100644
--- a/ironic/locale/bn_IN/LC_MESSAGES/ironic.po
+++ b/ironic/locale/bn_IN/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Bengali (India) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/bs/LC_MESSAGES/ironic.po b/ironic/locale/bs/LC_MESSAGES/ironic.po
index 31af11ef6..0a52b03c5 100644
--- a/ironic/locale/bs/LC_MESSAGES/ironic.po
+++ b/ironic/locale/bs/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Bosnian "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ca/LC_MESSAGES/ironic.po b/ironic/locale/ca/LC_MESSAGES/ironic.po
index 6f4e5fa73..58c96f41d 100644
--- a/ironic/locale/ca/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ca/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/cs/LC_MESSAGES/ironic.po b/ironic/locale/cs/LC_MESSAGES/ironic.po
index 697eea771..c92c836d1 100644
--- a/ironic/locale/cs/LC_MESSAGES/ironic.po
+++ b/ironic/locale/cs/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Czech "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/da/LC_MESSAGES/ironic.po b/ironic/locale/da/LC_MESSAGES/ironic.po
index 36a06c168..5e0a148ac 100644
--- a/ironic/locale/da/LC_MESSAGES/ironic.po
+++ b/ironic/locale/da/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/de/LC_MESSAGES/ironic.po b/ironic/locale/de/LC_MESSAGES/ironic.po
index 84b3993bf..cc17b7aff 100644
--- a/ironic/locale/de/LC_MESSAGES/ironic.po
+++ b/ironic/locale/de/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/el/LC_MESSAGES/ironic.po b/ironic/locale/el/LC_MESSAGES/ironic.po
index 554bd2bdc..96ac3f42e 100644
--- a/ironic/locale/el/LC_MESSAGES/ironic.po
+++ b/ironic/locale/el/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-03-22 00:52+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Greek "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2123,3 +2129,6 @@ msgstr ""
 msgid "Failed to migrate to version %(version)s on engine %(engine)s"
 msgstr ""
 
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
+#~ msgstr ""
+
diff --git a/ironic/locale/en_AU/LC_MESSAGES/ironic.po b/ironic/locale/en_AU/LC_MESSAGES/ironic.po
index aafe4f1b1..aaa9f7b04 100644
--- a/ironic/locale/en_AU/LC_MESSAGES/ironic.po
+++ b/ironic/locale/en_AU/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/en_GB/LC_MESSAGES/ironic.po b/ironic/locale/en_GB/LC_MESSAGES/ironic.po
index 8eeb6b347..e0212d6f3 100644
--- a/ironic/locale/en_GB/LC_MESSAGES/ironic.po
+++ b/ironic/locale/en_GB/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/en_US/LC_MESSAGES/ironic.po b/ironic/locale/en_US/LC_MESSAGES/ironic.po
index 5893bdd41..45dd057a6 100644
--- a/ironic/locale/en_US/LC_MESSAGES/ironic.po
+++ b/ironic/locale/en_US/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United States) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/es/LC_MESSAGES/ironic.po b/ironic/locale/es/LC_MESSAGES/ironic.po
index bf06ee25b..931613a0e 100644
--- a/ironic/locale/es/LC_MESSAGES/ironic.po
+++ b/ironic/locale/es/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/es_MX/LC_MESSAGES/ironic.po b/ironic/locale/es_MX/LC_MESSAGES/ironic.po
index 1c6d6636c..cc2d7e66f 100644
--- a/ironic/locale/es_MX/LC_MESSAGES/ironic.po
+++ b/ironic/locale/es_MX/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (Mexico) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/eu/LC_MESSAGES/ironic.po b/ironic/locale/eu/LC_MESSAGES/ironic.po
index 707db20f3..0ec35e423 100644
--- a/ironic/locale/eu/LC_MESSAGES/ironic.po
+++ b/ironic/locale/eu/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Basque "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/eu_ES/LC_MESSAGES/ironic.po b/ironic/locale/eu_ES/LC_MESSAGES/ironic.po
index 46ae68b44..ab7559b73 100644
--- a/ironic/locale/eu_ES/LC_MESSAGES/ironic.po
+++ b/ironic/locale/eu_ES/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-15 02:27+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Basque (Spain) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/fa/LC_MESSAGES/ironic.po b/ironic/locale/fa/LC_MESSAGES/ironic.po
index 55b9dad30..9b038e5f8 100644
--- a/ironic/locale/fa/LC_MESSAGES/ironic.po
+++ b/ironic/locale/fa/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-15 02:28+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Persian "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/fi_FI/LC_MESSAGES/ironic.po b/ironic/locale/fi_FI/LC_MESSAGES/ironic.po
index b6969b790..4321d5b3b 100644
--- a/ironic/locale/fi_FI/LC_MESSAGES/ironic.po
+++ b/ironic/locale/fi_FI/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Finnish (Finland) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/fil/LC_MESSAGES/ironic.po b/ironic/locale/fil/LC_MESSAGES/ironic.po
index 2973f814d..288fa533b 100644
--- a/ironic/locale/fil/LC_MESSAGES/ironic.po
+++ b/ironic/locale/fil/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Filipino "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/fr/LC_MESSAGES/ironic.po b/ironic/locale/fr/LC_MESSAGES/ironic.po
index 596b7d27c..0df3bb5ff 100644
--- a/ironic/locale/fr/LC_MESSAGES/ironic.po
+++ b/ironic/locale/fr/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/gl/LC_MESSAGES/ironic.po b/ironic/locale/gl/LC_MESSAGES/ironic.po
index f2fc51835..4e9b93291 100644
--- a/ironic/locale/gl/LC_MESSAGES/ironic.po
+++ b/ironic/locale/gl/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Galician "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/he/LC_MESSAGES/ironic.po b/ironic/locale/he/LC_MESSAGES/ironic.po
index 49f417975..dc51bb4ca 100644
--- a/ironic/locale/he/LC_MESSAGES/ironic.po
+++ b/ironic/locale/he/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-01-17 14:27+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Hebrew "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2273,14 +2279,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2296,10 +2294,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/he_IL/LC_MESSAGES/ironic.po b/ironic/locale/he_IL/LC_MESSAGES/ironic.po
index 636c2f063..a9f5ad4df 100644
--- a/ironic/locale/he_IL/LC_MESSAGES/ironic.po
+++ b/ironic/locale/he_IL/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-02-01 00:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hebrew (Israel) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2234,14 +2240,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2257,10 +2255,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/hi/LC_MESSAGES/ironic.po b/ironic/locale/hi/LC_MESSAGES/ironic.po
index aae908705..1fe846820 100644
--- a/ironic/locale/hi/LC_MESSAGES/ironic.po
+++ b/ironic/locale/hi/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hindi "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/hr/LC_MESSAGES/ironic.po b/ironic/locale/hr/LC_MESSAGES/ironic.po
index 2281027b4..b6c0f0ba6 100644
--- a/ironic/locale/hr/LC_MESSAGES/ironic.po
+++ b/ironic/locale/hr/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/hu/LC_MESSAGES/ironic.po b/ironic/locale/hu/LC_MESSAGES/ironic.po
index 0b653ffb7..227502f86 100644
--- a/ironic/locale/hu/LC_MESSAGES/ironic.po
+++ b/ironic/locale/hu/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/id/LC_MESSAGES/ironic.po b/ironic/locale/id/LC_MESSAGES/ironic.po
index d5ad45a05..955b3f30e 100644
--- a/ironic/locale/id/LC_MESSAGES/ironic.po
+++ b/ironic/locale/id/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ironic.pot b/ironic/locale/ironic.pot
index c46e69d48..1fd82bfcf 100644
--- a/ironic/locale/ironic.pot
+++ b/ironic/locale/ironic.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ironic jenkins.ironic.propose.translation.update.136\n"
+"Project-Id-Version: ironic jenkins.ironic.propose.translation.update.137\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+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"
@@ -439,42 +439,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -915,7 +919,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -984,7 +988,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -995,21 +999,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1017,35 +1021,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1140,44 +1144,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1260,34 +1266,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
diff --git a/ironic/locale/is_IS/LC_MESSAGES/ironic.po b/ironic/locale/is_IS/LC_MESSAGES/ironic.po
index f9bc73221..ba80cec22 100644
--- a/ironic/locale/is_IS/LC_MESSAGES/ironic.po
+++ b/ironic/locale/is_IS/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-01-02 13:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Icelandic (Iceland) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2288,14 +2294,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2311,10 +2309,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/it/LC_MESSAGES/ironic.po b/ironic/locale/it/LC_MESSAGES/ironic.po
index b6f2a8b58..6a6498203 100644
--- a/ironic/locale/it/LC_MESSAGES/ironic.po
+++ b/ironic/locale/it/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/it_IT/LC_MESSAGES/ironic.po b/ironic/locale/it_IT/LC_MESSAGES/ironic.po
index 155889526..1f0435e9f 100644
--- a/ironic/locale/it_IT/LC_MESSAGES/ironic.po
+++ b/ironic/locale/it_IT/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (Italy) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ja/LC_MESSAGES/ironic.po b/ironic/locale/ja/LC_MESSAGES/ironic.po
index 18393fc09..d26164ae7 100644
--- a/ironic/locale/ja/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ja/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ka_GE/LC_MESSAGES/ironic.po b/ironic/locale/ka_GE/LC_MESSAGES/ironic.po
index 1fdee78ab..77fdb9808 100644
--- a/ironic/locale/ka_GE/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ka_GE/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Georgian (Georgia) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/km/LC_MESSAGES/ironic.po b/ironic/locale/km/LC_MESSAGES/ironic.po
index 34c4e52ee..f600b27f4 100644
--- a/ironic/locale/km/LC_MESSAGES/ironic.po
+++ b/ironic/locale/km/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-15 02:27+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Khmer "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/kn/LC_MESSAGES/ironic.po b/ironic/locale/kn/LC_MESSAGES/ironic.po
index 0ad695cfe..080e1efd7 100644
--- a/ironic/locale/kn/LC_MESSAGES/ironic.po
+++ b/ironic/locale/kn/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Kannada "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ko_KR/LC_MESSAGES/ironic.po b/ironic/locale/ko_KR/LC_MESSAGES/ironic.po
index ec1d0f1d0..1d57a894c 100644
--- a/ironic/locale/ko_KR/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ko_KR/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ml_IN/LC_MESSAGES/ironic.po b/ironic/locale/ml_IN/LC_MESSAGES/ironic.po
index 957e3b8c6..61238ba97 100644
--- a/ironic/locale/ml_IN/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ml_IN/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-17 02:17+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Malayalam (India) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/mr_IN/LC_MESSAGES/ironic.po b/ironic/locale/mr_IN/LC_MESSAGES/ironic.po
index 9057fe66b..b0fd1366e 100644
--- a/ironic/locale/mr_IN/LC_MESSAGES/ironic.po
+++ b/ironic/locale/mr_IN/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Marathi (India) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ms/LC_MESSAGES/ironic.po b/ironic/locale/ms/LC_MESSAGES/ironic.po
index 6f6d82cea..15d864227 100644
--- a/ironic/locale/ms/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ms/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/nb/LC_MESSAGES/ironic.po b/ironic/locale/nb/LC_MESSAGES/ironic.po
index 354344c6f..1c8a6e368 100644
--- a/ironic/locale/nb/LC_MESSAGES/ironic.po
+++ b/ironic/locale/nb/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Norwegian Bokmål "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ne/LC_MESSAGES/ironic.po b/ironic/locale/ne/LC_MESSAGES/ironic.po
index e4a33baae..754634470 100644
--- a/ironic/locale/ne/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ne/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Nepali "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/nl_NL/LC_MESSAGES/ironic.po b/ironic/locale/nl_NL/LC_MESSAGES/ironic.po
index 59510c00d..8b8413593 100644
--- a/ironic/locale/nl_NL/LC_MESSAGES/ironic.po
+++ b/ironic/locale/nl_NL/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Dutch (Netherlands) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/pa_IN/LC_MESSAGES/ironic.po b/ironic/locale/pa_IN/LC_MESSAGES/ironic.po
index 892227816..e8561c515 100644
--- a/ironic/locale/pa_IN/LC_MESSAGES/ironic.po
+++ b/ironic/locale/pa_IN/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-01-02 13:42+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Panjabi (Punjabi) (India) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2288,14 +2294,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2311,10 +2309,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/pl_PL/LC_MESSAGES/ironic.po b/ironic/locale/pl_PL/LC_MESSAGES/ironic.po
index 2db01bd9b..22f28b896 100644
--- a/ironic/locale/pl_PL/LC_MESSAGES/ironic.po
+++ b/ironic/locale/pl_PL/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Polish (Poland) "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/pt/LC_MESSAGES/ironic.po b/ironic/locale/pt/LC_MESSAGES/ironic.po
index 54e4c9557..bef66fc3c 100644
--- a/ironic/locale/pt/LC_MESSAGES/ironic.po
+++ b/ironic/locale/pt/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/pt_BR/LC_MESSAGES/ironic.po b/ironic/locale/pt_BR/LC_MESSAGES/ironic.po
index 4f36c7b1f..0dfe5344e 100644
--- a/ironic/locale/pt_BR/LC_MESSAGES/ironic.po
+++ b/ironic/locale/pt_BR/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ro/LC_MESSAGES/ironic.po b/ironic/locale/ro/LC_MESSAGES/ironic.po
index f86a762eb..6b83d91c4 100644
--- a/ironic/locale/ro/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ro/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Romanian "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ru/LC_MESSAGES/ironic.po b/ironic/locale/ru/LC_MESSAGES/ironic.po
index f5402ccf5..1b62ece56 100644
--- a/ironic/locale/ru/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ru/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ru_RU/LC_MESSAGES/ironic.po b/ironic/locale/ru_RU/LC_MESSAGES/ironic.po
index 9afca7fce..ce14c4123 100644
--- a/ironic/locale/ru_RU/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ru_RU/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian (Russia) "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/sk/LC_MESSAGES/ironic.po b/ironic/locale/sk/LC_MESSAGES/ironic.po
index 6ad6d1a44..e43083e43 100644
--- a/ironic/locale/sk/LC_MESSAGES/ironic.po
+++ b/ironic/locale/sk/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Slovak "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/sl_SI/LC_MESSAGES/ironic.po b/ironic/locale/sl_SI/LC_MESSAGES/ironic.po
index bd64cc5e3..e95adbe96 100644
--- a/ironic/locale/sl_SI/LC_MESSAGES/ironic.po
+++ b/ironic/locale/sl_SI/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Slovenian (Slovenia) "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/sq/LC_MESSAGES/ironic.po b/ironic/locale/sq/LC_MESSAGES/ironic.po
index 6aedef672..a4e291106 100644
--- a/ironic/locale/sq/LC_MESSAGES/ironic.po
+++ b/ironic/locale/sq/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-03-22 00:52+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Albanian "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2123,3 +2129,6 @@ msgstr ""
 msgid "Failed to migrate to version %(version)s on engine %(engine)s"
 msgstr ""
 
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
+#~ msgstr ""
+
diff --git a/ironic/locale/sr/LC_MESSAGES/ironic.po b/ironic/locale/sr/LC_MESSAGES/ironic.po
index 8b0f49904..a7c38e773 100644
--- a/ironic/locale/sr/LC_MESSAGES/ironic.po
+++ b/ironic/locale/sr/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-03-23 18:31+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Serbian "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2124,3 +2130,6 @@ msgstr ""
 msgid "Failed to migrate to version %(version)s on engine %(engine)s"
 msgstr ""
 
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
+#~ msgstr ""
+
diff --git a/ironic/locale/sv/LC_MESSAGES/ironic.po b/ironic/locale/sv/LC_MESSAGES/ironic.po
index 640d3e934..23a22cae5 100644
--- a/ironic/locale/sv/LC_MESSAGES/ironic.po
+++ b/ironic/locale/sv/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-15 02:27+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Swedish "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/sw_KE/LC_MESSAGES/ironic.po b/ironic/locale/sw_KE/LC_MESSAGES/ironic.po
index ddaf8e58f..de6792fbc 100644
--- a/ironic/locale/sw_KE/LC_MESSAGES/ironic.po
+++ b/ironic/locale/sw_KE/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Swahili (Kenya) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ta/LC_MESSAGES/ironic.po b/ironic/locale/ta/LC_MESSAGES/ironic.po
index 99442c6ae..6293e9a23 100644
--- a/ironic/locale/ta/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ta/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-03-24 06:02+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Tamil "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2123,3 +2129,6 @@ msgstr ""
 msgid "Failed to migrate to version %(version)s on engine %(engine)s"
 msgstr ""
 
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
+#~ msgstr ""
+
diff --git a/ironic/locale/te_IN/LC_MESSAGES/ironic.po b/ironic/locale/te_IN/LC_MESSAGES/ironic.po
index 0b5553e0c..4b14ef9ec 100644
--- a/ironic/locale/te_IN/LC_MESSAGES/ironic.po
+++ b/ironic/locale/te_IN/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2014-03-24 05:56+0000\n"
 "Last-Translator: Tom Fifield <tom@openstack.org>\n"
 "Language-Team: Telugu (India) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2123,3 +2129,6 @@ msgstr ""
 msgid "Failed to migrate to version %(version)s on engine %(engine)s"
 msgstr ""
 
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
+#~ msgstr ""
+
diff --git a/ironic/locale/tl/LC_MESSAGES/ironic.po b/ironic/locale/tl/LC_MESSAGES/ironic.po
index af3d248f5..fec782d03 100644
--- a/ironic/locale/tl/LC_MESSAGES/ironic.po
+++ b/ironic/locale/tl/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Tagalog "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/tl_PH/LC_MESSAGES/ironic.po b/ironic/locale/tl_PH/LC_MESSAGES/ironic.po
index af1507605..93bcf5471 100644
--- a/ironic/locale/tl_PH/LC_MESSAGES/ironic.po
+++ b/ironic/locale/tl_PH/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Tagalog (Philippines) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/tr_TR/LC_MESSAGES/ironic.po b/ironic/locale/tr_TR/LC_MESSAGES/ironic.po
index a4ebef56f..470518a27 100644
--- a/ironic/locale/tr_TR/LC_MESSAGES/ironic.po
+++ b/ironic/locale/tr_TR/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Turkish (Turkey) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/uk/LC_MESSAGES/ironic.po b/ironic/locale/uk/LC_MESSAGES/ironic.po
index 01124b512..963d6acc1 100644
--- a/ironic/locale/uk/LC_MESSAGES/ironic.po
+++ b/ironic/locale/uk/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Ukrainian "
@@ -441,42 +441,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -917,7 +921,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -986,7 +990,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -997,21 +1001,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1019,35 +1023,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1142,44 +1146,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1262,34 +1268,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2352,14 +2358,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2375,10 +2373,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/ur/LC_MESSAGES/ironic.po b/ironic/locale/ur/LC_MESSAGES/ironic.po
index eb182d331..87bd120c8 100644
--- a/ironic/locale/ur/LC_MESSAGES/ironic.po
+++ b/ironic/locale/ur/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Urdu "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/vi_VN/LC_MESSAGES/ironic.po b/ironic/locale/vi_VN/LC_MESSAGES/ironic.po
index f7b005d23..12db65840 100644
--- a/ironic/locale/vi_VN/LC_MESSAGES/ironic.po
+++ b/ironic/locale/vi_VN/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/zh_CN/LC_MESSAGES/ironic.po b/ironic/locale/zh_CN/LC_MESSAGES/ironic.po
index 275d0de8f..cd2aead9c 100644
--- a/ironic/locale/zh_CN/LC_MESSAGES/ironic.po
+++ b/ironic/locale/zh_CN/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/zh_HK/LC_MESSAGES/ironic.po b/ironic/locale/zh_HK/LC_MESSAGES/ironic.po
index 1542751a3..e28f3a190 100644
--- a/ironic/locale/zh_HK/LC_MESSAGES/ironic.po
+++ b/ironic/locale/zh_HK/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Hong Kong) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""
 
diff --git a/ironic/locale/zh_TW/LC_MESSAGES/ironic.po b/ironic/locale/zh_TW/LC_MESSAGES/ironic.po
index 8af0ceb27..7772c2640 100644
--- a/ironic/locale/zh_TW/LC_MESSAGES/ironic.po
+++ b/ironic/locale/zh_TW/LC_MESSAGES/ironic.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Ironic\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-03-24 06:06+0000\n"
+"POT-Creation-Date: 2014-03-25 06:09+0000\n"
 "PO-Revision-Date: 2013-11-12 16:15+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Taiwan) "
@@ -440,42 +440,46 @@ msgstr ""
 msgid "Command stderr is: \"%s\""
 msgstr ""
 
-#: ironic/common/utils.py:99
+#: ironic/common/utils.py:98
+msgid "Invalid private key"
+msgstr ""
+
+#: ironic/common/utils.py:112
 #, python-format
 msgid "SSH connect failed: %s"
 msgstr ""
 
-#: ironic/common/utils.py:132
+#: ironic/common/utils.py:145
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: ironic/common/utils.py:310 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:323 ironic/openstack/common/fileutils.py:65
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: ironic/common/utils.py:398
+#: ironic/common/utils.py:411
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: ironic/common/utils.py:433
+#: ironic/common/utils.py:446
 #, python-format
 msgid "Failed to unlink %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:442
+#: ironic/common/utils.py:455
 #, python-format
 msgid "Failed to remove dir %(path)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:458
+#: ironic/common/utils.py:471
 #, python-format
 msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
 msgstr ""
 
-#: ironic/common/utils.py:472
+#: ironic/common/utils.py:485
 #, python-format
 msgid ""
 "Failed to remove trailing character. Returning original object. Supplied "
@@ -916,7 +920,7 @@ msgstr ""
 msgid "BMC inaccessible for node %(node)s: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:427
+#: ironic/drivers/modules/ipmitool.py:301 ironic/drivers/modules/ssh.py:432
 #, python-format
 msgid "set_power_state called with invalid power state %s."
 msgstr ""
@@ -985,7 +989,7 @@ msgid ""
 " %(node)s on the following ports: %(ports)s."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:372
+#: ironic/drivers/modules/pxe.py:543 ironic/drivers/modules/ssh.py:377
 #, python-format
 msgid "Node %s does not have any port associated with it."
 msgstr ""
@@ -996,21 +1000,21 @@ msgid ""
 "file or keystone catalog."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:676
+#: ironic/drivers/modules/pxe.py:664
 msgid "Deploy key is not match"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:681
 #, python-format
 msgid "Parameters %s were not passed to ironic for deploy."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:707
+#: ironic/drivers/modules/pxe.py:695
 #, python-format
 msgid "Unsupported method (%s) passed to PXE driver."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:728
+#: ironic/drivers/modules/pxe.py:716
 #, python-format
 msgid ""
 "Node %s failed to power off while handling deploy failure. This may be a "
@@ -1018,35 +1022,35 @@ msgid ""
 "maintenance mode until the problem is resolved."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:740
+#: ironic/drivers/modules/pxe.py:728
 #, python-format
 msgid "Node %s is not waiting to be deployed."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:752
+#: ironic/drivers/modules/pxe.py:740
 #, python-format
 msgid "Error returned from PXE deploy ramdisk: %s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:754
+#: ironic/drivers/modules/pxe.py:742
 msgid "Failure in PXE deploy ramdisk."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:757
+#: ironic/drivers/modules/pxe.py:745
 #, python-format
 msgid "Continuing deployment for node %(node)s, params %(params)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:763
+#: ironic/drivers/modules/pxe.py:751
 #, python-format
 msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:766
+#: ironic/drivers/modules/pxe.py:754
 msgid "PXE driver failed to continue deployment."
 msgstr ""
 
-#: ironic/drivers/modules/pxe.py:768
+#: ironic/drivers/modules/pxe.py:756
 #, python-format
 msgid "Deployment to node %s done"
 msgstr ""
@@ -1141,44 +1145,46 @@ msgstr ""
 msgid "SSHPowerDriver requires ssh_port to be integer value"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:174
+#: ironic/drivers/modules/ssh.py:175
 msgid "SSHPowerDriver requires virt_type be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:181
+#: ironic/drivers/modules/ssh.py:182
 msgid "SSHPowerDriver requires both address and username be set."
 msgstr ""
 
 #: ironic/drivers/modules/ssh.py:187
-msgid "SSHPowerDriver requires either password or key_filename be set."
+msgid ""
+"SSHPowerDriver requires one and only one of password, key_contents and "
+"key_filename to be set."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:191
+#: ironic/drivers/modules/ssh.py:196
 #, python-format
 msgid "SSH key file %s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:224
+#: ironic/drivers/modules/ssh.py:229
 #, python-format
 msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:255
+#: ironic/drivers/modules/ssh.py:260
 #, python-format
 msgid "Retrieved Node List: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:260
+#: ironic/drivers/modules/ssh.py:265
 #, python-format
 msgid "Checking Node: %s's Mac address."
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:273
+#: ironic/drivers/modules/ssh.py:278
 #, python-format
 msgid "Found Mac address: %s"
 msgstr ""
 
-#: ironic/drivers/modules/ssh.py:377
+#: ironic/drivers/modules/ssh.py:382
 #, python-format
 msgid "SSH connection cannot be established: %s"
 msgstr ""
@@ -1261,34 +1267,34 @@ msgid ""
 "'%(state)s'."
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:535
+#: ironic/nova/virt/ironic/driver.py:534
 #, python-format
 msgid "Failed to unassociate the instance %(instance)s with node %(node)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:618
+#: ironic/nova/virt/ironic/driver.py:617
 #, python-format
 msgid "plug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:627
+#: ironic/nova/virt/ironic/driver.py:626
 #, python-format
 msgid ""
 "Ironic node: %(id)s virtual to physical interface count  missmatch (Vif "
 "count: %(vif_count)d, Pif count: %(pif_count)d)"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:647
+#: ironic/nova/virt/ironic/driver.py:646
 #, python-format
 msgid "Failed to set the VIF networking for port %s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:652
+#: ironic/nova/virt/ironic/driver.py:651
 #, python-format
 msgid "unplug: instance_uuid=%(uuid)s vif=%(network_info)s"
 msgstr ""
 
-#: ironic/nova/virt/ironic/driver.py:666
+#: ironic/nova/virt/ironic/driver.py:665
 #, python-format
 msgid "Failed to remove the VIF networking for port %s"
 msgstr ""
@@ -2351,14 +2357,6 @@ msgstr ""
 #~ msgid "Database server has gone away: %s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "This application has not enabled MySQL"
-#~ " traditional mode, which means silent "
-#~ "data corruption may occur. Please "
-#~ "encourage the application developers to "
-#~ "enable this mode."
-#~ msgstr ""
-
 #~ msgid "SQL connection failed. %s attempts left."
 #~ msgstr ""
 
@@ -2374,10 +2372,6 @@ msgstr ""
 #~ msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Migration number for migrate plugin must"
-#~ " be valid integer or empty, if "
-#~ "you want to downgrade to initial "
-#~ "state"
+#~ msgid "SSHPowerDriver requires either password or key_filename be set."
 #~ msgstr ""