summaryrefslogtreecommitdiff
path: root/ironic/locale
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2014-08-12 06:10:29 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2014-08-12 06:10:29 +0000
commit6de8a007b29dfd82fcf1ad5db51b33a7261e3722 (patch)
tree92c618de1ac856c1c3fbb63c6319eb309db34cb6 /ironic/locale
parentdc8418d22ce57d72a5daf60216635fdda223ec3a (diff)
downloadironic-6de8a007b29dfd82fcf1ad5db51b33a7261e3722.tar.gz
Imported Translations from Transifex
Change-Id: I894325f530ddad6e956ccf0160233875bbc0ed45
Diffstat (limited to 'ironic/locale')
-rw-r--r--ironic/locale/en_AU/LC_MESSAGES/ironic.po86
-rw-r--r--ironic/locale/en_GB/LC_MESSAGES/ironic-log-error.po10
-rw-r--r--ironic/locale/en_GB/LC_MESSAGES/ironic-log-info.po138
-rw-r--r--ironic/locale/en_GB/LC_MESSAGES/ironic-log-warning.po32
-rw-r--r--ironic/locale/en_US/LC_MESSAGES/ironic.po86
-rw-r--r--ironic/locale/ironic.pot88
6 files changed, 301 insertions, 139 deletions
diff --git a/ironic/locale/en_AU/LC_MESSAGES/ironic.po b/ironic/locale/en_AU/LC_MESSAGES/ironic.po
index 38e27dd08..9a67d0ab6 100644
--- a/ironic/locale/en_AU/LC_MESSAGES/ironic.po
+++ b/ironic/locale/en_AU/LC_MESSAGES/ironic.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Ironic\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-08 06:10+0000\n"
+"POT-Creation-Date: 2014-08-12 06:10+0000\n"
"PO-Revision-Date: 2014-07-21 23:13+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: English (Australia) "
@@ -38,7 +38,7 @@ msgstr "Node %s is already being provisioned or decommissioned."
msgid "Chassis id not specified."
msgstr "Chassis id not specified."
-#: ironic/api/controllers/v1/node.py:773
+#: ironic/api/controllers/v1/node.py:774
#, python-format
msgid "Node %s can not be updated while a state transition is in progress."
msgstr "Node %s can not be updated while a state transition is in progress."
@@ -903,15 +903,15 @@ msgstr ""
"Deploy timed out, but an unhandled exception was encountered while "
"aborting. More info may be found in the log file."
-#: ironic/db/sqlalchemy/api.py:331
+#: ironic/db/sqlalchemy/api.py:330
msgid "Cannot overwrite UUID for an existing Node."
msgstr ""
-#: ironic/db/sqlalchemy/api.py:419
+#: ironic/db/sqlalchemy/api.py:417
msgid "Cannot overwrite UUID for an existing Port."
msgstr ""
-#: ironic/db/sqlalchemy/api.py:485
+#: ironic/db/sqlalchemy/api.py:482
msgid "Cannot overwrite UUID for an existing Chassis."
msgstr ""
@@ -937,7 +937,7 @@ msgstr "Unsupported method (%s) passed through to vendor extension."
msgid "Method not specified when calling vendor extension."
msgstr "Method not specified when calling vendor extension."
-#: ironic/drivers/modules/agent.py:108 ironic/drivers/modules/pxe.py:654
+#: ironic/drivers/modules/agent.py:108 ironic/drivers/modules/pxe.py:693
#, python-format
msgid ""
"Node %s failed to power off while handling deploy failure. This may be a "
@@ -948,7 +948,7 @@ msgstr ""
"serious condition. Node should be removed from Ironic or put in "
"maintenance mode until the problem is resolved."
-#: ironic/drivers/modules/agent.py:159 ironic/drivers/modules/pxe.py:304
+#: ironic/drivers/modules/agent.py:159 ironic/drivers/modules/pxe.py:331
#, python-format
msgid ""
"Disk volume where '%(path)s' is located doesn't have enough disk space. "
@@ -1047,68 +1047,68 @@ msgstr ""
msgid "No console pid found for node %s while trying to stop shellinabox console."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:228
+#: ironic/drivers/modules/deploy_utils.py:233
#, python-format
msgid ""
"Failed to erase beginning of disk for node %(node)s. Command: "
"%(command)s. Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:240
+#: ironic/drivers/modules/deploy_utils.py:245
#, python-format
msgid ""
"Failed to get disk block count for node %(node)s. Command: %(command)s. "
"Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:253
+#: ironic/drivers/modules/deploy_utils.py:258
#, python-format
msgid ""
"Failed to erase the end of the disk on node %(node)s. Command: "
"%(command)s. Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:280
+#: ironic/drivers/modules/deploy_utils.py:285
#, python-format
msgid "Parent device '%s' not found"
msgstr "Parent device '%s' not found"
-#: ironic/drivers/modules/deploy_utils.py:297
+#: ironic/drivers/modules/deploy_utils.py:302
#, python-format
msgid "Root device '%s' not found"
msgstr "Root device '%s' not found"
-#: ironic/drivers/modules/deploy_utils.py:300
+#: ironic/drivers/modules/deploy_utils.py:305
#, python-format
msgid "Swap device '%s' not found"
msgstr "Swap device '%s' not found"
-#: ironic/drivers/modules/deploy_utils.py:304
+#: ironic/drivers/modules/deploy_utils.py:309
#, python-format
msgid "Ephemeral device '%s' not found"
msgstr "Ephemeral device '%s' not found"
-#: ironic/drivers/modules/deploy_utils.py:318
+#: ironic/drivers/modules/deploy_utils.py:323
msgid "Failed to detect root device UUID."
msgstr "Failed to detect root device UUID."
-#: ironic/drivers/modules/deploy_utils.py:357
-#: ironic/drivers/modules/deploy_utils.py:363
+#: ironic/drivers/modules/deploy_utils.py:362
+#: ironic/drivers/modules/deploy_utils.py:368
#, python-format
msgid "Deploy to address %s failed."
msgstr "Deploy to address %s failed."
-#: ironic/drivers/modules/deploy_utils.py:358
+#: ironic/drivers/modules/deploy_utils.py:363
#, python-format
msgid "Command: %s"
msgstr "Command: %s"
-#: ironic/drivers/modules/deploy_utils.py:359
+#: ironic/drivers/modules/deploy_utils.py:364
#, python-format
msgid "StdOut: %r"
msgstr "StdOut: %r"
-#: ironic/drivers/modules/deploy_utils.py:360
+#: ironic/drivers/modules/deploy_utils.py:365
#, python-format
msgid "StdErr: %r"
msgstr "StdErr: %r"
@@ -1345,15 +1345,15 @@ msgstr "Unsupported method (%s) passed to IPMItool driver."
msgid "IPMI terminal port not supplied to IPMI driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:96
+#: ironic/drivers/modules/pxe.py:110
msgid "UUID (from Glance) of the deployment kernel. Required."
msgstr ""
-#: ironic/drivers/modules/pxe.py:98
+#: ironic/drivers/modules/pxe.py:112
msgid "UUID (from Glance) of the ramdisk that is mounted at boot time. Required."
msgstr ""
-#: ironic/drivers/modules/pxe.py:111
+#: ironic/drivers/modules/pxe.py:125
#, python-format
msgid ""
"Can not validate PXE bootloader. The following parameters were not passed"
@@ -1362,46 +1362,50 @@ msgstr ""
"Can not validate PXE bootloader. The following parameters were not passed"
" to ironic: %s"
-#: ironic/drivers/modules/pxe.py:161
+#: ironic/drivers/modules/pxe.py:175
#, python-format
msgid ""
"Can not validate PXE bootloader. Invalid parameter %(param)s. Reason: "
"%(reason)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:167
+#: ironic/drivers/modules/pxe.py:181
#, python-format
msgid "'%s' is not an integer value."
msgstr "'%s' is not an integer value."
-#: ironic/drivers/modules/pxe.py:433
+#: ironic/drivers/modules/pxe.py:461
#, python-format
msgid ""
"Root partition is too small for requested image. Image size: %(image_mb)d"
" MB, Root size: %(root_mb)d MB"
msgstr ""
-#: ironic/drivers/modules/pxe.py:454
+#: ironic/drivers/modules/pxe.py:482
#, python-format
msgid "Failed to connect to Glance to get the properties of the image %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:458
+#: ironic/drivers/modules/pxe.py:486
#, python-format
msgid "Image %s not found in Glance"
msgstr ""
-#: ironic/drivers/modules/pxe.py:468
+#: ironic/drivers/modules/pxe.py:496
#, python-format
msgid "Image %(image)s is missing the following properties: %(properties)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:487 ironic/drivers/modules/ssh.py:457
+#: ironic/drivers/modules/pxe.py:515 ironic/drivers/modules/ssh.py:457
#, python-format
msgid "Node %s does not have any port associated with it."
msgstr "Node %s does not have any port associated with it."
-#: ironic/drivers/modules/pxe.py:499
+#: ironic/drivers/modules/pxe.py:522
+msgid "iPXE boot is enabled but no HTTP URL or HTTP root was specified."
+msgstr ""
+
+#: ironic/drivers/modules/pxe.py:533
msgid ""
"Couldn't get the URL of the Ironic API service from the configuration "
"file or keystone catalog."
@@ -1409,49 +1413,49 @@ msgstr ""
"Couldn't get the URL of the Ironic API service from the configuration "
"file or keystone catalog."
-#: ironic/drivers/modules/pxe.py:597
+#: ironic/drivers/modules/pxe.py:636
msgid "Deploy key does not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:616
+#: ironic/drivers/modules/pxe.py:655
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr "Parameters %s were not passed to ironic for deploy."
-#: ironic/drivers/modules/pxe.py:633
+#: ironic/drivers/modules/pxe.py:672
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr "Unsupported method (%s) passed to PXE driver."
-#: ironic/drivers/modules/pxe.py:666
+#: ironic/drivers/modules/pxe.py:705
#, python-format
msgid "Node %s is not waiting to be deployed."
msgstr "Node %s is not waiting to be deployed."
-#: ironic/drivers/modules/pxe.py:678
+#: ironic/drivers/modules/pxe.py:717
#, python-format
msgid "Error returned from PXE deploy ramdisk: %s"
msgstr "Error returned from PXE deploy ramdisk: %s"
-#: ironic/drivers/modules/pxe.py:680
+#: ironic/drivers/modules/pxe.py:719
msgid "Failure in PXE deploy ramdisk."
msgstr "Failure in PXE deploy ramdisk."
-#: ironic/drivers/modules/pxe.py:684
+#: ironic/drivers/modules/pxe.py:723
#, python-format
msgid "Continuing deployment for node %(node)s, params %(params)s"
msgstr "Continuing deployment for node %(node)s, params %(params)s"
-#: ironic/drivers/modules/pxe.py:690
+#: ironic/drivers/modules/pxe.py:729
#, python-format
msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
msgstr "PXE deploy failed for instance %(instance)s. Error: %(error)s"
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:732
msgid "PXE driver failed to continue deployment."
msgstr "PXE driver failed to continue deployment."
-#: ironic/drivers/modules/pxe.py:695
+#: ironic/drivers/modules/pxe.py:734
#, python-format
msgid "Deployment to node %s done"
msgstr "Deployment to node %s done"
diff --git a/ironic/locale/en_GB/LC_MESSAGES/ironic-log-error.po b/ironic/locale/en_GB/LC_MESSAGES/ironic-log-error.po
index 46ebe07c0..c310a3ad3 100644
--- a/ironic/locale/en_GB/LC_MESSAGES/ironic-log-error.po
+++ b/ironic/locale/en_GB/LC_MESSAGES/ironic-log-error.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Ironic\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-08 06:10+0000\n"
-"PO-Revision-Date: 2014-08-07 07:52+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"POT-Creation-Date: 2014-08-12 06:10+0000\n"
+"PO-Revision-Date: 2014-08-11 14:21+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
"ironic/language/en_GB/)\n"
"Language: en_GB\n"
@@ -23,7 +23,7 @@ msgstr ""
#: ironic/drivers/modules/agent.py:421
#, python-format
msgid "Async exception for %(node)s: %(msg)s"
-msgstr ""
+msgstr "Async exception for %(node)s: %(msg)s"
#: ironic/drivers/modules/ipminative.py:345
#, python-format
@@ -58,6 +58,8 @@ msgid ""
"Failed to set boot device for node %(node)s, virt_type %(vtype)s does not "
"support this operation"
msgstr ""
+"Failed to set boot device for node %(node)s, virt_type %(vtype)s does not "
+"support this operation"
#: ironic/nova/virt/ironic/driver.py:296
#, python-format
diff --git a/ironic/locale/en_GB/LC_MESSAGES/ironic-log-info.po b/ironic/locale/en_GB/LC_MESSAGES/ironic-log-info.po
new file mode 100644
index 000000000..2f7309e3e
--- /dev/null
+++ b/ironic/locale/en_GB/LC_MESSAGES/ironic-log-info.po
@@ -0,0 +1,138 @@
+# Translations template for ironic.
+# Copyright (C) 2014 ORGANIZATION
+# This file is distributed under the same license as the ironic project.
+#
+# Translators:
+# Andi Chandler <andi@gowling.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Ironic\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2014-08-12 06:10+0000\n"
+"PO-Revision-Date: 2014-08-11 14:21+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
+"ironic/language/en_GB/)\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 1.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ironic/common/service.py:77
+#, python-format
+msgid "Created RPC server for service %(service)s on host %(host)s."
+msgstr "Created RPC server for service %(service)s on host %(host)s."
+
+#: ironic/common/service.py:94
+#, python-format
+msgid "Stopped RPC server for service %(service)s on host %(host)s."
+msgstr "Stopped RPC server for service %(service)s on host %(host)s."
+
+#: ironic/conductor/manager.py:210
+#, python-format
+msgid "Successfuly started conductor with hostname %(hostname)s."
+msgstr "Successfuly started conductor with hostname %(hostname)s."
+
+#: ironic/conductor/manager.py:222
+#, python-format
+msgid "Successfully stopped conductor with hostname %(hostname)s."
+msgstr "Successfully stopped conductor with hostname %(hostname)s."
+
+#: ironic/conductor/manager.py:496
+#, python-format
+msgid "Successfully deployed node %(node)s with instance %(instance)s."
+msgstr "Successfully deployed node %(node)s with instance %(instance)s."
+
+#: ironic/conductor/manager.py:577
+#, python-format
+msgid "Successfully unprovisioned node %(node)s with instance %(instance)s."
+msgstr "Successfully unprovisioned node %(node)s with instance %(instance)s."
+
+#: ironic/conductor/manager.py:924
+#, python-format
+msgid "Successfully deleted node %(node)s."
+msgstr "Successfully deleted node %(node)s."
+
+#: ironic/conductor/utils.py:115
+#, python-format
+msgid "Succesfully set node %(node)s power state to %(state)s."
+msgstr "Succesfully set node %(node)s power state to %(state)s."
+
+#: ironic/openstack/common/eventlet_backdoor.py:140
+#, python-format
+msgid "Eventlet backdoor listening on %(port)s for process %(pid)d"
+msgstr "Eventlet backdoor listening on %(port)s for process %(pid)d"
+
+#: ironic/openstack/common/lockutils.py:82
+#, python-format
+msgid "Created lock path: %s"
+msgstr "Created lock path: %s"
+
+#: ironic/openstack/common/lockutils.py:251
+#, python-format
+msgid "Failed to remove file %(file)s"
+msgstr "Failed to remove file %(file)s"
+
+#: ironic/openstack/common/periodic_task.py:126
+#, python-format
+msgid "Skipping periodic task %(task)s because its interval is negative"
+msgstr "Skipping periodic task %(task)s because its interval is negative"
+
+#: ironic/openstack/common/periodic_task.py:131
+#, python-format
+msgid "Skipping periodic task %(task)s because it is disabled"
+msgstr "Skipping periodic task %(task)s because it is disabled"
+
+#: ironic/openstack/common/service.py:176
+#, python-format
+msgid "Caught %s, exiting"
+msgstr "Caught %s, exiting"
+
+#: ironic/openstack/common/service.py:240
+msgid "Parent process has died unexpectedly, exiting"
+msgstr "Parent process has died unexpectedly, exiting"
+
+#: ironic/openstack/common/service.py:271
+#, python-format
+msgid "Child caught %s, exiting"
+msgstr "Child caught %s, exiting"
+
+#: ironic/openstack/common/service.py:310
+msgid "Forking too fast, sleeping"
+msgstr "Forking too fast, sleeping"
+
+#: ironic/openstack/common/service.py:329
+#, python-format
+msgid "Started child %d"
+msgstr "Started child %d"
+
+#: ironic/openstack/common/service.py:339
+#, python-format
+msgid "Starting %d workers"
+msgstr "Starting %d workers"
+
+#: ironic/openstack/common/service.py:356
+#, python-format
+msgid "Child %(pid)d killed by signal %(sig)d"
+msgstr "Child %(pid)d killed by signal %(sig)d"
+
+#: ironic/openstack/common/service.py:360
+#, python-format
+msgid "Child %(pid)s exited with status %(code)d"
+msgstr "Child %(pid)s exited with status %(code)d"
+
+#: ironic/openstack/common/service.py:399
+#, python-format
+msgid "Caught %s, stopping children"
+msgstr "Caught %s, stopping children"
+
+#: ironic/openstack/common/service.py:408
+msgid "Wait called after thread killed. Cleaning up."
+msgstr "Wait called after thread killed. Cleaning up."
+
+#: ironic/openstack/common/service.py:424
+#, python-format
+msgid "Waiting on %d children to exit"
+msgstr "Waiting on %d children to exit"
diff --git a/ironic/locale/en_GB/LC_MESSAGES/ironic-log-warning.po b/ironic/locale/en_GB/LC_MESSAGES/ironic-log-warning.po
index d48844426..c10b8ce2d 100644
--- a/ironic/locale/en_GB/LC_MESSAGES/ironic-log-warning.po
+++ b/ironic/locale/en_GB/LC_MESSAGES/ironic-log-warning.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Ironic\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-08 06:10+0000\n"
-"PO-Revision-Date: 2014-07-29 11:01+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"POT-Creation-Date: 2014-08-12 06:10+0000\n"
+"PO-Revision-Date: 2014-08-11 14:31+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
"ironic/language/en_GB/)\n"
"Language: en_GB\n"
@@ -37,6 +37,8 @@ msgid ""
"get_sensors_data is not implemented for driver %(driver)s, node_uuid is "
"%(node)s"
msgstr ""
+"get_sensors_data is not implemented for driver %(driver)s, node_uuid is "
+"%(node)s"
#: ironic/conductor/manager.py:1105
#, python-format
@@ -44,6 +46,8 @@ msgid ""
"During get_sensors_data, could not parse sensor data for node %(node)s. "
"Error: %(err)s."
msgstr ""
+"During get_sensors_data, could not parse sensor data for node %(node)s. "
+"Error: %(err)s."
#: ironic/conductor/manager.py:1109
#, python-format
@@ -51,6 +55,8 @@ msgid ""
"During get_sensors_data, could not get sensor data for node %(node)s. Error: "
"%(err)s."
msgstr ""
+"During get_sensors_data, could not get sensor data for node %(node)s. Error: "
+"%(err)s."
#: ironic/conductor/manager.py:1113
#, python-format
@@ -58,11 +64,13 @@ msgid ""
"During send_sensor_data, node %(node)s was not found and presumed deleted by "
"another process."
msgstr ""
+"During send_sensor_data, node %(node)s was not found and presumed deleted by "
+"another process."
#: ironic/conductor/manager.py:1117
#, python-format
msgid "Failed to get sensor data for node %(node)s. Error: %(error)s"
-msgstr ""
+msgstr "Failed to get sensor data for node %(node)s. Error: %(error)s"
#: ironic/conductor/task_manager.py:277
#, python-format
@@ -72,12 +80,12 @@ msgstr "Task's on_error hook failed to call %(method)s on node %(node)s"
#: ironic/drivers/modules/agent.py:567
#, python-format
msgid "Malformed MAC: %s"
-msgstr ""
+msgstr "Malformed MAC: %s"
#: ironic/drivers/modules/agent.py:606
#, python-format
msgid "MAC address %s not found in database"
-msgstr ""
+msgstr "MAC address %s not found in database"
#: ironic/drivers/modules/ipmitool.py:596
#, python-format
@@ -103,6 +111,8 @@ msgid ""
"Failed to get boot device for node %(node)s, virt_type %(vtype)s does not "
"support this operation"
msgstr ""
+"Failed to get boot device for node %(node)s, virt_type %(vtype)s does not "
+"support this operation"
#: ironic/nova/virt/ironic/driver.py:100
#, python-format
@@ -122,21 +132,21 @@ msgstr "Destroy called on non-existing instance %s."
#: ironic/openstack/common/loopingcall.py:87
#, python-format
msgid "task %(func_name)s run outlasted interval by %(delay).2f sec"
-msgstr ""
+msgstr "task %(func_name)s run outlasted interval by %(delay).2f sec"
#: ironic/openstack/common/network_utils.py:149
msgid "tcp_keepidle not available on your system"
-msgstr ""
+msgstr "tcp_keepidle not available on your system"
#: ironic/openstack/common/network_utils.py:156
msgid "tcp_keepintvl not available on your system"
-msgstr ""
+msgstr "tcp_keepintvl not available on your system"
#: ironic/openstack/common/network_utils.py:163
msgid "tcp_keepknt not available on your system"
-msgstr ""
+msgstr "tcp_keepknt not available on your system"
#: ironic/openstack/common/service.py:364
#, python-format
msgid "pid %d not in child list"
-msgstr ""
+msgstr "pid %d not in child list"
diff --git a/ironic/locale/en_US/LC_MESSAGES/ironic.po b/ironic/locale/en_US/LC_MESSAGES/ironic.po
index 2f497f020..78824fe12 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-08-08 06:10+0000\n"
+"POT-Creation-Date: 2014-08-12 06:10+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: English (United States) "
@@ -37,7 +37,7 @@ msgstr ""
msgid "Chassis id not specified."
msgstr ""
-#: ironic/api/controllers/v1/node.py:773
+#: ironic/api/controllers/v1/node.py:774
#, python-format
msgid "Node %s can not be updated while a state transition is in progress."
msgstr ""
@@ -857,15 +857,15 @@ msgid ""
"aborting. More info may be found in the log file."
msgstr ""
-#: ironic/db/sqlalchemy/api.py:331
+#: ironic/db/sqlalchemy/api.py:330
msgid "Cannot overwrite UUID for an existing Node."
msgstr ""
-#: ironic/db/sqlalchemy/api.py:419
+#: ironic/db/sqlalchemy/api.py:417
msgid "Cannot overwrite UUID for an existing Port."
msgstr ""
-#: ironic/db/sqlalchemy/api.py:485
+#: ironic/db/sqlalchemy/api.py:482
msgid "Cannot overwrite UUID for an existing Chassis."
msgstr ""
@@ -891,7 +891,7 @@ msgstr ""
msgid "Method not specified when calling vendor extension."
msgstr ""
-#: ironic/drivers/modules/agent.py:108 ironic/drivers/modules/pxe.py:654
+#: ironic/drivers/modules/agent.py:108 ironic/drivers/modules/pxe.py:693
#, python-format
msgid ""
"Node %s failed to power off while handling deploy failure. This may be a "
@@ -899,7 +899,7 @@ msgid ""
"maintenance mode until the problem is resolved."
msgstr ""
-#: ironic/drivers/modules/agent.py:159 ironic/drivers/modules/pxe.py:304
+#: ironic/drivers/modules/agent.py:159 ironic/drivers/modules/pxe.py:331
#, python-format
msgid ""
"Disk volume where '%(path)s' is located doesn't have enough disk space. "
@@ -998,68 +998,68 @@ msgstr ""
msgid "No console pid found for node %s while trying to stop shellinabox console."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:228
+#: ironic/drivers/modules/deploy_utils.py:233
#, python-format
msgid ""
"Failed to erase beginning of disk for node %(node)s. Command: "
"%(command)s. Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:240
+#: ironic/drivers/modules/deploy_utils.py:245
#, python-format
msgid ""
"Failed to get disk block count for node %(node)s. Command: %(command)s. "
"Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:253
+#: ironic/drivers/modules/deploy_utils.py:258
#, python-format
msgid ""
"Failed to erase the end of the disk on node %(node)s. Command: "
"%(command)s. Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:280
+#: ironic/drivers/modules/deploy_utils.py:285
#, python-format
msgid "Parent device '%s' not found"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:297
+#: ironic/drivers/modules/deploy_utils.py:302
#, python-format
msgid "Root device '%s' not found"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:300
+#: ironic/drivers/modules/deploy_utils.py:305
#, python-format
msgid "Swap device '%s' not found"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:304
+#: ironic/drivers/modules/deploy_utils.py:309
#, python-format
msgid "Ephemeral device '%s' not found"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:318
+#: ironic/drivers/modules/deploy_utils.py:323
msgid "Failed to detect root device UUID."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:357
-#: ironic/drivers/modules/deploy_utils.py:363
+#: ironic/drivers/modules/deploy_utils.py:362
+#: ironic/drivers/modules/deploy_utils.py:368
#, python-format
msgid "Deploy to address %s failed."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:358
+#: ironic/drivers/modules/deploy_utils.py:363
#, python-format
msgid "Command: %s"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:359
+#: ironic/drivers/modules/deploy_utils.py:364
#, python-format
msgid "StdOut: %r"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:360
+#: ironic/drivers/modules/deploy_utils.py:365
#, python-format
msgid "StdErr: %r"
msgstr ""
@@ -1284,109 +1284,113 @@ msgstr ""
msgid "IPMI terminal port not supplied to IPMI driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:96
+#: ironic/drivers/modules/pxe.py:110
msgid "UUID (from Glance) of the deployment kernel. Required."
msgstr ""
-#: ironic/drivers/modules/pxe.py:98
+#: ironic/drivers/modules/pxe.py:112
msgid "UUID (from Glance) of the ramdisk that is mounted at boot time. Required."
msgstr ""
-#: ironic/drivers/modules/pxe.py:111
+#: ironic/drivers/modules/pxe.py:125
#, python-format
msgid ""
"Can not validate PXE bootloader. The following parameters were not passed"
" to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:161
+#: ironic/drivers/modules/pxe.py:175
#, python-format
msgid ""
"Can not validate PXE bootloader. Invalid parameter %(param)s. Reason: "
"%(reason)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:167
+#: ironic/drivers/modules/pxe.py:181
#, python-format
msgid "'%s' is not an integer value."
msgstr ""
-#: ironic/drivers/modules/pxe.py:433
+#: ironic/drivers/modules/pxe.py:461
#, python-format
msgid ""
"Root partition is too small for requested image. Image size: %(image_mb)d"
" MB, Root size: %(root_mb)d MB"
msgstr ""
-#: ironic/drivers/modules/pxe.py:454
+#: ironic/drivers/modules/pxe.py:482
#, python-format
msgid "Failed to connect to Glance to get the properties of the image %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:458
+#: ironic/drivers/modules/pxe.py:486
#, python-format
msgid "Image %s not found in Glance"
msgstr ""
-#: ironic/drivers/modules/pxe.py:468
+#: ironic/drivers/modules/pxe.py:496
#, python-format
msgid "Image %(image)s is missing the following properties: %(properties)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:487 ironic/drivers/modules/ssh.py:457
+#: ironic/drivers/modules/pxe.py:515 ironic/drivers/modules/ssh.py:457
#, python-format
msgid "Node %s does not have any port associated with it."
msgstr ""
-#: ironic/drivers/modules/pxe.py:499
+#: ironic/drivers/modules/pxe.py:522
+msgid "iPXE boot is enabled but no HTTP URL or HTTP root was specified."
+msgstr ""
+
+#: ironic/drivers/modules/pxe.py:533
msgid ""
"Couldn't get the URL of the Ironic API service from the configuration "
"file or keystone catalog."
msgstr ""
-#: ironic/drivers/modules/pxe.py:597
+#: ironic/drivers/modules/pxe.py:636
msgid "Deploy key does not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:616
+#: ironic/drivers/modules/pxe.py:655
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:633
+#: ironic/drivers/modules/pxe.py:672
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:666
+#: ironic/drivers/modules/pxe.py:705
#, python-format
msgid "Node %s is not waiting to be deployed."
msgstr ""
-#: ironic/drivers/modules/pxe.py:678
+#: ironic/drivers/modules/pxe.py:717
#, python-format
msgid "Error returned from PXE deploy ramdisk: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:680
+#: ironic/drivers/modules/pxe.py:719
msgid "Failure in PXE deploy ramdisk."
msgstr ""
-#: ironic/drivers/modules/pxe.py:684
+#: ironic/drivers/modules/pxe.py:723
#, python-format
msgid "Continuing deployment for node %(node)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:690
+#: ironic/drivers/modules/pxe.py:729
#, python-format
msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:732
msgid "PXE driver failed to continue deployment."
msgstr ""
-#: ironic/drivers/modules/pxe.py:695
+#: ironic/drivers/modules/pxe.py:734
#, python-format
msgid "Deployment to node %s done"
msgstr ""
diff --git a/ironic/locale/ironic.pot b/ironic/locale/ironic.pot
index 588d38c60..aa76d8322 100644
--- a/ironic/locale/ironic.pot
+++ b/ironic/locale/ironic.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: ironic 2014.2.dev58.g55e2ea9\n"
+"Project-Id-Version: ironic 2014.2.dev74.gdc8418d\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-08-08 06:10+0000\n"
+"POT-Creation-Date: 2014-08-12 06:10+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"
@@ -36,7 +36,7 @@ msgstr ""
msgid "Chassis id not specified."
msgstr ""
-#: ironic/api/controllers/v1/node.py:773
+#: ironic/api/controllers/v1/node.py:774
#, python-format
msgid "Node %s can not be updated while a state transition is in progress."
msgstr ""
@@ -856,15 +856,15 @@ msgid ""
"aborting. More info may be found in the log file."
msgstr ""
-#: ironic/db/sqlalchemy/api.py:331
+#: ironic/db/sqlalchemy/api.py:330
msgid "Cannot overwrite UUID for an existing Node."
msgstr ""
-#: ironic/db/sqlalchemy/api.py:419
+#: ironic/db/sqlalchemy/api.py:417
msgid "Cannot overwrite UUID for an existing Port."
msgstr ""
-#: ironic/db/sqlalchemy/api.py:485
+#: ironic/db/sqlalchemy/api.py:482
msgid "Cannot overwrite UUID for an existing Chassis."
msgstr ""
@@ -890,7 +890,7 @@ msgstr ""
msgid "Method not specified when calling vendor extension."
msgstr ""
-#: ironic/drivers/modules/agent.py:108 ironic/drivers/modules/pxe.py:654
+#: ironic/drivers/modules/agent.py:108 ironic/drivers/modules/pxe.py:693
#, python-format
msgid ""
"Node %s failed to power off while handling deploy failure. This may be a "
@@ -898,7 +898,7 @@ msgid ""
"maintenance mode until the problem is resolved."
msgstr ""
-#: ironic/drivers/modules/agent.py:159 ironic/drivers/modules/pxe.py:304
+#: ironic/drivers/modules/agent.py:159 ironic/drivers/modules/pxe.py:331
#, python-format
msgid ""
"Disk volume where '%(path)s' is located doesn't have enough disk space. "
@@ -997,68 +997,68 @@ msgstr ""
msgid "No console pid found for node %s while trying to stop shellinabox console."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:228
+#: ironic/drivers/modules/deploy_utils.py:233
#, python-format
msgid ""
"Failed to erase beginning of disk for node %(node)s. Command: "
"%(command)s. Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:240
+#: ironic/drivers/modules/deploy_utils.py:245
#, python-format
msgid ""
"Failed to get disk block count for node %(node)s. Command: %(command)s. "
"Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:253
+#: ironic/drivers/modules/deploy_utils.py:258
#, python-format
msgid ""
"Failed to erase the end of the disk on node %(node)s. Command: "
"%(command)s. Error: %(error)s."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:280
+#: ironic/drivers/modules/deploy_utils.py:285
#, python-format
msgid "Parent device '%s' not found"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:297
+#: ironic/drivers/modules/deploy_utils.py:302
#, python-format
msgid "Root device '%s' not found"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:300
+#: ironic/drivers/modules/deploy_utils.py:305
#, python-format
msgid "Swap device '%s' not found"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:304
+#: ironic/drivers/modules/deploy_utils.py:309
#, python-format
msgid "Ephemeral device '%s' not found"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:318
+#: ironic/drivers/modules/deploy_utils.py:323
msgid "Failed to detect root device UUID."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:357
-#: ironic/drivers/modules/deploy_utils.py:363
+#: ironic/drivers/modules/deploy_utils.py:362
+#: ironic/drivers/modules/deploy_utils.py:368
#, python-format
msgid "Deploy to address %s failed."
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:358
+#: ironic/drivers/modules/deploy_utils.py:363
#, python-format
msgid "Command: %s"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:359
+#: ironic/drivers/modules/deploy_utils.py:364
#, python-format
msgid "StdOut: %r"
msgstr ""
-#: ironic/drivers/modules/deploy_utils.py:360
+#: ironic/drivers/modules/deploy_utils.py:365
#, python-format
msgid "StdErr: %r"
msgstr ""
@@ -1283,109 +1283,113 @@ msgstr ""
msgid "IPMI terminal port not supplied to IPMI driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:96
+#: ironic/drivers/modules/pxe.py:110
msgid "UUID (from Glance) of the deployment kernel. Required."
msgstr ""
-#: ironic/drivers/modules/pxe.py:98
+#: ironic/drivers/modules/pxe.py:112
msgid "UUID (from Glance) of the ramdisk that is mounted at boot time. Required."
msgstr ""
-#: ironic/drivers/modules/pxe.py:111
+#: ironic/drivers/modules/pxe.py:125
#, python-format
msgid ""
"Can not validate PXE bootloader. The following parameters were not passed"
" to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:161
+#: ironic/drivers/modules/pxe.py:175
#, python-format
msgid ""
"Can not validate PXE bootloader. Invalid parameter %(param)s. Reason: "
"%(reason)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:167
+#: ironic/drivers/modules/pxe.py:181
#, python-format
msgid "'%s' is not an integer value."
msgstr ""
-#: ironic/drivers/modules/pxe.py:433
+#: ironic/drivers/modules/pxe.py:461
#, python-format
msgid ""
"Root partition is too small for requested image. Image size: %(image_mb)d"
" MB, Root size: %(root_mb)d MB"
msgstr ""
-#: ironic/drivers/modules/pxe.py:454
+#: ironic/drivers/modules/pxe.py:482
#, python-format
msgid "Failed to connect to Glance to get the properties of the image %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:458
+#: ironic/drivers/modules/pxe.py:486
#, python-format
msgid "Image %s not found in Glance"
msgstr ""
-#: ironic/drivers/modules/pxe.py:468
+#: ironic/drivers/modules/pxe.py:496
#, python-format
msgid "Image %(image)s is missing the following properties: %(properties)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:487 ironic/drivers/modules/ssh.py:457
+#: ironic/drivers/modules/pxe.py:515 ironic/drivers/modules/ssh.py:457
#, python-format
msgid "Node %s does not have any port associated with it."
msgstr ""
-#: ironic/drivers/modules/pxe.py:499
+#: ironic/drivers/modules/pxe.py:522
+msgid "iPXE boot is enabled but no HTTP URL or HTTP root was specified."
+msgstr ""
+
+#: ironic/drivers/modules/pxe.py:533
msgid ""
"Couldn't get the URL of the Ironic API service from the configuration "
"file or keystone catalog."
msgstr ""
-#: ironic/drivers/modules/pxe.py:597
+#: ironic/drivers/modules/pxe.py:636
msgid "Deploy key does not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:616
+#: ironic/drivers/modules/pxe.py:655
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:633
+#: ironic/drivers/modules/pxe.py:672
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:666
+#: ironic/drivers/modules/pxe.py:705
#, python-format
msgid "Node %s is not waiting to be deployed."
msgstr ""
-#: ironic/drivers/modules/pxe.py:678
+#: ironic/drivers/modules/pxe.py:717
#, python-format
msgid "Error returned from PXE deploy ramdisk: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:680
+#: ironic/drivers/modules/pxe.py:719
msgid "Failure in PXE deploy ramdisk."
msgstr ""
-#: ironic/drivers/modules/pxe.py:684
+#: ironic/drivers/modules/pxe.py:723
#, python-format
msgid "Continuing deployment for node %(node)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:690
+#: ironic/drivers/modules/pxe.py:729
#, python-format
msgid "PXE deploy failed for instance %(instance)s. Error: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:693
+#: ironic/drivers/modules/pxe.py:732
msgid "PXE driver failed to continue deployment."
msgstr ""
-#: ironic/drivers/modules/pxe.py:695
+#: ironic/drivers/modules/pxe.py:734
#, python-format
msgid "Deployment to node %s done"
msgstr ""