summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Jenkins <jenkins@openstack.org>2013-12-02 06:00:15 +0000
committerOpenStack Jenkins <jenkins@openstack.org>2013-12-02 06:00:15 +0000
commit7393c49931f0f20dc2a3fcb0d29338399372dd05 (patch)
tree6eddfeef25514118f52aa95282275bd284edbfa8
parent7d4a858d895ad396fec4b4f5831f37915c0ebfe4 (diff)
downloadironic-7393c49931f0f20dc2a3fcb0d29338399372dd05.tar.gz
Imported Translations from Transifex
Change-Id: I4d6b088154ac9e04d8ddf1e2eceb3b8f759be683
-rw-r--r--ironic/locale/ar/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/bg_BG/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/bn_IN/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/bs/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ca/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/cs/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/da/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/de/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/en_AU/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/en_GB/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/en_US/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/es/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/es_MX/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/eu/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/eu_ES/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/fa/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/fi_FI/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/fil/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/fr/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/gl/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/hi/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/hr/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/hu/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/id/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ironic.pot286
-rw-r--r--ironic/locale/it/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/it_IT/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ja/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ka_GE/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/km/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/kn/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ko_KR/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ml_IN/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/mr_IN/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ms/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/nb/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ne/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/nl_NL/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/pl_PL/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/pt/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/pt_BR/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ro/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ru/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ru_RU/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/sk/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/sl_SI/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/sv/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/sw_KE/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/tl/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/tl_PH/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/tr_TR/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/uk/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/ur/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/vi_VN/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/zh_CN/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/zh_HK/LC_MESSAGES/ironic.po295
-rw-r--r--ironic/locale/zh_TW/LC_MESSAGES/ironic.po295
57 files changed, 8939 insertions, 7867 deletions
diff --git a/ironic/locale/ar/LC_MESSAGES/ironic.po b/ironic/locale/ar/LC_MESSAGES/ironic.po
index ddb162011..4360ed1b3 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Arabic "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/bg_BG/LC_MESSAGES/ironic.po b/ironic/locale/bg_BG/LC_MESSAGES/ironic.po
index f977acec0..696bf728e 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Bulgarian (Bulgaria) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/bn_IN/LC_MESSAGES/ironic.po b/ironic/locale/bn_IN/LC_MESSAGES/ironic.po
index 93597b874..0f8bb07b4 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Bengali (India) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/bs/LC_MESSAGES/ironic.po b/ironic/locale/bs/LC_MESSAGES/ironic.po
index 60ce7236d..d6415c53d 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Bosnian "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ca/LC_MESSAGES/ironic.po b/ironic/locale/ca/LC_MESSAGES/ironic.po
index 278323420..14acdedc4 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Catalan "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/cs/LC_MESSAGES/ironic.po b/ironic/locale/cs/LC_MESSAGES/ironic.po
index aae1e118b..c86949864 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Czech "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/da/LC_MESSAGES/ironic.po b/ironic/locale/da/LC_MESSAGES/ironic.po
index 0f58e4be2..fbae935b3 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Danish "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/de/LC_MESSAGES/ironic.po b/ironic/locale/de/LC_MESSAGES/ironic.po
index 42e3894ed..003aaae95 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: German "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/en_AU/LC_MESSAGES/ironic.po b/ironic/locale/en_AU/LC_MESSAGES/ironic.po
index 66f178f1d..b2719ad5a 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: English (Australia) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/en_GB/LC_MESSAGES/ironic.po b/ironic/locale/en_GB/LC_MESSAGES/ironic.po
index 80dc8411b..b2f8ec22f 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: English (United Kingdom) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/en_US/LC_MESSAGES/ironic.po b/ironic/locale/en_US/LC_MESSAGES/ironic.po
index 981d2ad4b..b4fd7d466 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: English (United States) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/es/LC_MESSAGES/ironic.po b/ironic/locale/es/LC_MESSAGES/ironic.po
index dbd71a799..7cea7e2fa 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Spanish "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/es_MX/LC_MESSAGES/ironic.po b/ironic/locale/es_MX/LC_MESSAGES/ironic.po
index 45b63a5a3..8cda5783d 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Spanish (Mexico) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/eu/LC_MESSAGES/ironic.po b/ironic/locale/eu/LC_MESSAGES/ironic.po
index 0c67a2156..ff25b80ef 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Basque "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/eu_ES/LC_MESSAGES/ironic.po b/ironic/locale/eu_ES/LC_MESSAGES/ironic.po
index 5a827fba5..9aaf44bc9 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+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) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/fa/LC_MESSAGES/ironic.po b/ironic/locale/fa/LC_MESSAGES/ironic.po
index ce02120f4..f0ef5fc09 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-15 02:28+0000\n"
"Last-Translator: Tom Fifield <tom@openstack.org>\n"
"Language-Team: Persian "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/fi_FI/LC_MESSAGES/ironic.po b/ironic/locale/fi_FI/LC_MESSAGES/ironic.po
index 3b194678a..1100c3c40 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Finnish (Finland) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/fil/LC_MESSAGES/ironic.po b/ironic/locale/fil/LC_MESSAGES/ironic.po
index 7f723bb26..82ed8beb9 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Filipino "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/fr/LC_MESSAGES/ironic.po b/ironic/locale/fr/LC_MESSAGES/ironic.po
index 1fc71fa02..6a4b2aee5 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: French "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/gl/LC_MESSAGES/ironic.po b/ironic/locale/gl/LC_MESSAGES/ironic.po
index d3cc341b9..b6712aacf 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Galician "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/hi/LC_MESSAGES/ironic.po b/ironic/locale/hi/LC_MESSAGES/ironic.po
index 5125eaa1c..83bcd8c43 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Hindi "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/hr/LC_MESSAGES/ironic.po b/ironic/locale/hr/LC_MESSAGES/ironic.po
index c2393dac4..7667c605a 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Croatian "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/hu/LC_MESSAGES/ironic.po b/ironic/locale/hu/LC_MESSAGES/ironic.po
index 736cea337..87e6b6a93 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Hungarian "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/id/LC_MESSAGES/ironic.po b/ironic/locale/id/LC_MESSAGES/ironic.po
index 7323383bf..045d9c101 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Indonesian "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ironic.pot b/ironic/locale/ironic.pot
index ca3fc0154..410963ff2 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.14\n"
+"Project-Id-Version: ironic jenkins.ironic.propose.translation.update.21\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+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"
@@ -138,287 +138,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -463,64 +449,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -708,15 +672,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -793,117 +757,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1072,6 +1031,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1183,36 +1168,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
diff --git a/ironic/locale/it/LC_MESSAGES/ironic.po b/ironic/locale/it/LC_MESSAGES/ironic.po
index bcf683967..4aae36302 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Italian "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/it_IT/LC_MESSAGES/ironic.po b/ironic/locale/it_IT/LC_MESSAGES/ironic.po
index 8bfbdefd6..175d4bec3 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Italian (Italy) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ja/LC_MESSAGES/ironic.po b/ironic/locale/ja/LC_MESSAGES/ironic.po
index 3fa1f8aef..a2dd4eb19 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Japanese "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ka_GE/LC_MESSAGES/ironic.po b/ironic/locale/ka_GE/LC_MESSAGES/ironic.po
index 91d83a5c0..49e2b28f4 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Georgian (Georgia) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/km/LC_MESSAGES/ironic.po b/ironic/locale/km/LC_MESSAGES/ironic.po
index 65e0d172c..1390168b0 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-15 02:27+0000\n"
"Last-Translator: Tom Fifield <tom@openstack.org>\n"
"Language-Team: Khmer "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/kn/LC_MESSAGES/ironic.po b/ironic/locale/kn/LC_MESSAGES/ironic.po
index 1fb1b29a1..46377e114 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Kannada "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ko_KR/LC_MESSAGES/ironic.po b/ironic/locale/ko_KR/LC_MESSAGES/ironic.po
index f6b4fa916..5b16f9dfa 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Korean (Korea) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ml_IN/LC_MESSAGES/ironic.po b/ironic/locale/ml_IN/LC_MESSAGES/ironic.po
index cf0240bee..87d68f402 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-17 02:17+0000\n"
"Last-Translator: Tom Fifield <tom@openstack.org>\n"
"Language-Team: Malayalam (India) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/mr_IN/LC_MESSAGES/ironic.po b/ironic/locale/mr_IN/LC_MESSAGES/ironic.po
index ab1b9b4ca..1efda269e 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Marathi (India) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ms/LC_MESSAGES/ironic.po b/ironic/locale/ms/LC_MESSAGES/ironic.po
index 276c02da0..fe15f3387 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Malay "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/nb/LC_MESSAGES/ironic.po b/ironic/locale/nb/LC_MESSAGES/ironic.po
index bc0f99245..e2849bd46 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Norwegian Bokmål "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ne/LC_MESSAGES/ironic.po b/ironic/locale/ne/LC_MESSAGES/ironic.po
index 3ff19c851..5ea755b71 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Nepali "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/nl_NL/LC_MESSAGES/ironic.po b/ironic/locale/nl_NL/LC_MESSAGES/ironic.po
index 6e8bc35ca..197a12c2d 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Dutch (Netherlands) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/pl_PL/LC_MESSAGES/ironic.po b/ironic/locale/pl_PL/LC_MESSAGES/ironic.po
index a3df5379e..63fd2aaf2 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Polish (Poland) "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/pt/LC_MESSAGES/ironic.po b/ironic/locale/pt/LC_MESSAGES/ironic.po
index 200fa89fc..89a509d29 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Portuguese "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/pt_BR/LC_MESSAGES/ironic.po b/ironic/locale/pt_BR/LC_MESSAGES/ironic.po
index 2162a7ae6..d0e437bfd 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Portuguese (Brazil) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ro/LC_MESSAGES/ironic.po b/ironic/locale/ro/LC_MESSAGES/ironic.po
index fd56dd13b..993c95244 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Romanian "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ru/LC_MESSAGES/ironic.po b/ironic/locale/ru/LC_MESSAGES/ironic.po
index cbe1502e5..4a9825be5 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Russian "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ru_RU/LC_MESSAGES/ironic.po b/ironic/locale/ru_RU/LC_MESSAGES/ironic.po
index 1d17aabfa..16782595f 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Russian (Russia) "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/sk/LC_MESSAGES/ironic.po b/ironic/locale/sk/LC_MESSAGES/ironic.po
index 04fadf63e..7460cdbc2 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Slovak "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/sl_SI/LC_MESSAGES/ironic.po b/ironic/locale/sl_SI/LC_MESSAGES/ironic.po
index 8d148d9e6..149ebb5a6 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Slovenian (Slovenia) "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/sv/LC_MESSAGES/ironic.po b/ironic/locale/sv/LC_MESSAGES/ironic.po
index c64a76ca0..5520fbba2 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-15 02:27+0000\n"
"Last-Translator: Tom Fifield <tom@openstack.org>\n"
"Language-Team: Swedish "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/sw_KE/LC_MESSAGES/ironic.po b/ironic/locale/sw_KE/LC_MESSAGES/ironic.po
index c5d877efe..04a2a3183 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Swahili (Kenya) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/tl/LC_MESSAGES/ironic.po b/ironic/locale/tl/LC_MESSAGES/ironic.po
index b2b61d492..eb7933ea0 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Tagalog "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/tl_PH/LC_MESSAGES/ironic.po b/ironic/locale/tl_PH/LC_MESSAGES/ironic.po
index 0dfbc16ad..68e59e721 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Tagalog (Philippines) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/tr_TR/LC_MESSAGES/ironic.po b/ironic/locale/tr_TR/LC_MESSAGES/ironic.po
index d699f23b1..85273c5d3 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Turkish (Turkey) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/uk/LC_MESSAGES/ironic.po b/ironic/locale/uk/LC_MESSAGES/ironic.po
index 0dd6e087f..0074b5f33 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Ukrainian "
@@ -140,287 +140,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -465,64 +451,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -710,15 +674,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -795,117 +759,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1074,6 +1033,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1185,36 +1170,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1702,3 +1710,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/ur/LC_MESSAGES/ironic.po b/ironic/locale/ur/LC_MESSAGES/ironic.po
index 1e4631701..09001ee67 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Urdu "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/vi_VN/LC_MESSAGES/ironic.po b/ironic/locale/vi_VN/LC_MESSAGES/ironic.po
index 3409c0dff..d84c10966 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Vietnamese (Viet Nam) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/zh_CN/LC_MESSAGES/ironic.po b/ironic/locale/zh_CN/LC_MESSAGES/ironic.po
index 7ae6e6ac7..548b2dd21 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Chinese (China) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/zh_HK/LC_MESSAGES/ironic.po b/ironic/locale/zh_HK/LC_MESSAGES/ironic.po
index bd916901c..7747db5b3 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Chinese (Hong Kong) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+
diff --git a/ironic/locale/zh_TW/LC_MESSAGES/ironic.po b/ironic/locale/zh_TW/LC_MESSAGES/ironic.po
index d8b455aed..616335c1d 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: 2013-11-25 06:00+0000\n"
+"POT-Creation-Date: 2013-12-02 06:00+0000\n"
"PO-Revision-Date: 2013-11-12 16:15+0000\n"
"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
"Language-Team: Chinese (Taiwan) "
@@ -139,287 +139,273 @@ msgstr ""
msgid "Configuration:"
msgstr ""
-#: ironic/common/exception.py:60
-msgid "Unexpected error while running command."
-msgstr ""
-
-#: ironic/common/exception.py:63
-#, python-format
-msgid ""
-"%(description)s\n"
-"Command: %(cmd)s\n"
-"Exit code: %(exit_code)s\n"
-"Stdout: %(stdout)r\n"
-"Stderr: %(stderr)r"
-msgstr ""
-
-#: ironic/common/exception.py:125
+#: ironic/common/exception.py:103
msgid "An unknown exception occurred."
msgstr ""
-#: ironic/common/exception.py:146 ironic/openstack/common/rpc/common.py:87
+#: ironic/common/exception.py:124 ironic/openstack/common/rpc/common.py:87
msgid "Exception in string format operation"
msgstr ""
-#: ironic/common/exception.py:166
+#: ironic/common/exception.py:144
msgid "Not authorized."
msgstr ""
-#: ironic/common/exception.py:171
+#: ironic/common/exception.py:149
msgid "User does not have admin privileges"
msgstr ""
-#: ironic/common/exception.py:175
+#: ironic/common/exception.py:153
#, python-format
msgid "Policy doesn't allow %(action)s to be performed."
msgstr ""
-#: ironic/common/exception.py:179
+#: ironic/common/exception.py:157
msgid "Operation not permitted."
msgstr ""
-#: ironic/common/exception.py:183
+#: ironic/common/exception.py:161
msgid "Unacceptable parameters."
msgstr ""
-#: ironic/common/exception.py:188
+#: ironic/common/exception.py:166
msgid "Invalid resource state."
msgstr ""
-#: ironic/common/exception.py:193
+#: ironic/common/exception.py:171
#, python-format
msgid "Unacceptable CPU info: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:197
+#: ironic/common/exception.py:175
#, python-format
msgid "%(address)s is not a valid IP v4/6 address."
msgstr ""
-#: ironic/common/exception.py:201
+#: ironic/common/exception.py:179
#, python-format
msgid "Disk format %(disk_format)s is not acceptable"
msgstr ""
-#: ironic/common/exception.py:205
+#: ironic/common/exception.py:183
#, python-format
msgid "Expected a uuid but received %(uuid)s."
msgstr ""
-#: ironic/common/exception.py:209
+#: ironic/common/exception.py:187
#, python-format
msgid "Expected an uuid or int but received %(identity)s."
msgstr ""
-#: ironic/common/exception.py:213
+#: ironic/common/exception.py:191
#, python-format
msgid "Expected a MAC address but received %(mac)s."
msgstr ""
-#: ironic/common/exception.py:217
+#: ironic/common/exception.py:195
#, python-format
msgid "Failed to deploy instance: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:221 ironic/common/exception.py:225
+#: ironic/common/exception.py:199 ironic/common/exception.py:203
#, python-format
msgid "Image %(image_id)s is unacceptable: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:231
+#: ironic/common/exception.py:209
#, python-format
msgid "%(err)s"
msgstr ""
-#: ironic/common/exception.py:235
+#: ironic/common/exception.py:213
msgid "Resource could not be found."
msgstr ""
-#: ironic/common/exception.py:240
+#: ironic/common/exception.py:218
#, python-format
msgid "No disk at %(location)s"
msgstr ""
-#: ironic/common/exception.py:244
+#: ironic/common/exception.py:222
#, python-format
msgid "Failed to load driver %(driver_name)s."
msgstr ""
-#: ironic/common/exception.py:248
+#: ironic/common/exception.py:226
#, python-format
msgid "Image %(image_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:252
+#: ironic/common/exception.py:230
#, python-format
msgid "Host %(host)s could not be found."
msgstr ""
-#: ironic/common/exception.py:256
+#: ironic/common/exception.py:234
#, python-format
msgid "Console %(console_id)s could not be found."
msgstr ""
-#: ironic/common/exception.py:260
+#: ironic/common/exception.py:238
#, python-format
msgid "File %(file_path)s could not be found."
msgstr ""
-#: ironic/common/exception.py:264
+#: ironic/common/exception.py:242
#, python-format
msgid "No valid host was found. %(reason)s"
msgstr ""
-#: ironic/common/exception.py:268
+#: ironic/common/exception.py:246
#, python-format
msgid "Instance %(instance)s could not be found."
msgstr ""
-#: ironic/common/exception.py:272
+#: ironic/common/exception.py:250
#, python-format
msgid "Node %(node)s could not be found."
msgstr ""
-#: ironic/common/exception.py:276
+#: ironic/common/exception.py:254
#, python-format
msgid "Node %(node)s is locked by another process."
msgstr ""
-#: ironic/common/exception.py:280
+#: ironic/common/exception.py:258
#, python-format
msgid "Node %(node)s is associated with instance %(instance)s."
msgstr ""
-#: ironic/common/exception.py:284
+#: ironic/common/exception.py:262
#, python-format
msgid "Port %(port)s could not be found."
msgstr ""
-#: ironic/common/exception.py:288
+#: ironic/common/exception.py:266
#, python-format
msgid "Chassis %(chassis)s could not be found."
msgstr ""
-#: ironic/common/exception.py:292
+#: ironic/common/exception.py:270
#, python-format
msgid "Conductor %(conductor)s could not be found."
msgstr ""
-#: ironic/common/exception.py:296
+#: ironic/common/exception.py:274
#, python-format
msgid "Conductor %(conductor)s already registered."
msgstr ""
-#: ironic/common/exception.py:300
+#: ironic/common/exception.py:278
#, python-format
msgid "Failed to set node power state to %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:304
+#: ironic/common/exception.py:282
msgid "An exclusive lock is required, but the current context has a shared lock."
msgstr ""
-#: ironic/common/exception.py:309
+#: ironic/common/exception.py:287
#, python-format
msgid ""
"Unable to complete the requested action because node %(node)s is "
"currently in use by another process."
msgstr ""
-#: ironic/common/exception.py:314
+#: ironic/common/exception.py:292
#, python-format
msgid ""
"Can not change instance association while node %(node)s is in power state"
" %(pstate)s."
msgstr ""
-#: ironic/common/exception.py:319
+#: ironic/common/exception.py:297
#, python-format
msgid "Can not change power state because node %(node)s is not fully configured."
msgstr ""
-#: ironic/common/exception.py:324
+#: ironic/common/exception.py:302
#, python-format
msgid ""
"Cannot complete the requested action because chassis %(chassis)s contains"
" nodes."
msgstr ""
-#: ironic/common/exception.py:329
+#: ironic/common/exception.py:307
#, python-format
msgid "IPMI call failed: %(cmd)s."
msgstr ""
-#: ironic/common/exception.py:333
+#: ironic/common/exception.py:311
#, python-format
msgid "Failed to establish SSH connection to host %(host)s."
msgstr ""
-#: ironic/common/exception.py:337
+#: ironic/common/exception.py:315
#, python-format
msgid "Unsupported object type %(objtype)s"
msgstr ""
-#: ironic/common/exception.py:341
+#: ironic/common/exception.py:319
#, python-format
msgid "Cannot call %(method)s on orphaned %(objtype)s object"
msgstr ""
-#: ironic/common/exception.py:345
+#: ironic/common/exception.py:323
#, python-format
msgid "Driver %(driver)s for node %(node)s does not support %(extension)s."
msgstr ""
-#: ironic/common/exception.py:350
+#: ironic/common/exception.py:328
#, python-format
msgid "Version %(objver)s of %(objname)s is not supported"
msgstr ""
-#: ironic/common/exception.py:354
+#: ironic/common/exception.py:332
#, python-format
msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
msgstr ""
-#: ironic/common/exception.py:359
+#: ironic/common/exception.py:337
#, python-format
msgid "Not authorized for image %(image_id)s."
msgstr ""
-#: ironic/common/exception.py:363
+#: ironic/common/exception.py:341
#, python-format
msgid "Invalid image href %(image_href)s."
msgstr ""
-#: ironic/common/exception.py:367
+#: ironic/common/exception.py:345
msgid "Unauthorised for keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:375
+#: ironic/common/exception.py:353
#, python-format
msgid "Attr %(attr)s with value %(value)s not found in keystone service catalog."
msgstr ""
-#: ironic/common/exception.py:380
+#: ironic/common/exception.py:358
msgid "Connection failed"
msgstr ""
-#: ironic/common/exception.py:384
+#: ironic/common/exception.py:362
msgid "Requested OpenStack Images API is forbidden"
msgstr ""
-#: ironic/common/exception.py:392
+#: ironic/common/exception.py:370
msgid "Requested version of OpenStack Images API is not available."
msgstr ""
-#: ironic/common/exception.py:396
+#: ironic/common/exception.py:374
msgid "The provided endpoint is invalid"
msgstr ""
-#: ironic/common/exception.py:400
+#: ironic/common/exception.py:378
msgid "Unable to communicate with the server."
msgstr ""
-#: ironic/common/exception.py:416
+#: ironic/common/exception.py:394
#, python-format
msgid "Could not find config at %(path)s"
msgstr ""
@@ -464,64 +450,42 @@ msgstr ""
msgid "Rule checked when requested rule is not found"
msgstr ""
-#: ironic/common/utils.py:115 ironic/openstack/common/processutils.py:127
-#, python-format
-msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
-
-#: ironic/common/utils.py:126 ironic/openstack/common/processutils.py:142
-#, python-format
-msgid "Running cmd (subprocess): %s"
-msgstr ""
-
-#: ironic/common/utils.py:150 ironic/drivers/modules/ssh.py:100
-#: ironic/openstack/common/processutils.py:167
-#: ironic/openstack/common/processutils.py:240
-#, python-format
-msgid "Result was %s"
-msgstr ""
-
-#: ironic/common/utils.py:163 ironic/openstack/common/processutils.py:179
-#, python-format
-msgid "%r failed. Retrying."
-msgstr ""
-
-#: ironic/common/utils.py:221
+#: ironic/common/utils.py:124
#, python-format
msgid "SSH connect failed: %s"
msgstr ""
-#: ironic/common/utils.py:254
+#: ironic/common/utils.py:157
#, python-format
msgid "Invalid backend: %s"
msgstr ""
-#: ironic/common/utils.py:408 ironic/openstack/common/fileutils.py:65
+#: ironic/common/utils.py:311 ironic/openstack/common/fileutils.py:65
#, python-format
msgid "Reloading cached file %s"
msgstr ""
-#: ironic/common/utils.py:496
+#: ironic/common/utils.py:399
#, python-format
msgid "Could not remove tmpdir: %s"
msgstr ""
-#: ironic/common/utils.py:531
+#: ironic/common/utils.py:434
#, python-format
msgid "Failed to unlink %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:540
+#: ironic/common/utils.py:443
#, python-format
msgid "Failed to remove dir %(path)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:556
+#: ironic/common/utils.py:459
#, python-format
msgid "Failed to create symlink from %(source)s to %(link)s, error: %(e)s"
msgstr ""
-#: ironic/common/utils.py:570
+#: ironic/common/utils.py:473
#, python-format
msgid ""
"Failed to remove trailing character. Returning original object. Supplied "
@@ -709,15 +673,15 @@ msgstr ""
msgid "set_power_state called with an invalid power state: %s."
msgstr ""
-#: ironic/drivers/modules/fake.py:65
+#: ironic/drivers/modules/fake.py:66
msgid "Invalid vendor passthru, no 'method' specified."
msgstr ""
-#: ironic/drivers/modules/fake.py:71
+#: ironic/drivers/modules/fake.py:72
msgid "Parameter not passed to Ironic."
msgstr ""
-#: ironic/drivers/modules/fake.py:75
+#: ironic/drivers/modules/fake.py:76
#, python-format
msgid "Unsupported method (%s) passed through to vendor extension."
msgstr ""
@@ -794,117 +758,112 @@ msgstr ""
msgid "IPMI power off failed for node %s."
msgstr ""
-#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:335
+#: ironic/drivers/modules/ipmitool.py:208 ironic/drivers/modules/ssh.py:310
#, python-format
msgid "set_power_state called with invalid power state %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:108
+#: ironic/drivers/modules/pxe.py:113
#, python-format
msgid ""
"Can not validate PXE bootloader. The following paramenters were not "
"passed to ironic: %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:123
+#: ironic/drivers/modules/pxe.py:128
#, python-format
msgid "Can not validate PXE bootloader. Invalid parameter %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:142
+#: ironic/drivers/modules/pxe.py:147
#, python-format
msgid "Building PXE config for deployment %s."
msgstr ""
-#: ironic/drivers/modules/pxe.py:316
+#: ironic/drivers/modules/pxe.py:321
#, python-format
msgid "Fetching kernel and ramdisk for instance %s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:346
+#: ironic/drivers/modules/pxe.py:351
#, python-format
msgid "Fetching image %(ami)s for instance %(name)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:522
+#: ironic/drivers/modules/pxe.py:527
msgid "Deploy key is not match"
msgstr ""
-#: ironic/drivers/modules/pxe.py:538
+#: ironic/drivers/modules/pxe.py:543
#, python-format
msgid "Parameters %s were not passed to ironic for deploy."
msgstr ""
-#: ironic/drivers/modules/pxe.py:552
+#: ironic/drivers/modules/pxe.py:557
#, python-format
msgid "Unsupported method (%s) passed to PXE driver."
msgstr ""
-#: ironic/drivers/modules/pxe.py:565
+#: ironic/drivers/modules/pxe.py:570
#, python-format
msgid "Node %(node_id)s deploy error message: %(error)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:568
+#: ironic/drivers/modules/pxe.py:573
#, python-format
msgid "start deployment for node %(node_id)s, params %(params)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:577
+#: ironic/drivers/modules/pxe.py:582
#, python-format
msgid "deployment to node %s failed"
msgstr ""
-#: ironic/drivers/modules/pxe.py:580
+#: ironic/drivers/modules/pxe.py:585
#, python-format
msgid "Deploy error: \"%(error)s\" for node %(node_id)s"
msgstr ""
-#: ironic/drivers/modules/pxe.py:584
+#: ironic/drivers/modules/pxe.py:589
#, python-format
msgid "deployment to node %s done"
msgstr ""
-#: ironic/drivers/modules/ssh.py:85 ironic/openstack/common/processutils.py:219
-#, python-format
-msgid "Running cmd (SSH): %s"
-msgstr ""
-
-#: ironic/drivers/modules/ssh.py:129
+#: ironic/drivers/modules/ssh.py:102
msgid "SSHPowerDriver requires virt_type be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:135
+#: ironic/drivers/modules/ssh.py:108
#, python-format
msgid ""
"SSHPowerDriver '%(virt_type)s' is not a valid virt_type, supported types "
"are: %(valid)s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:143
+#: ironic/drivers/modules/ssh.py:116
msgid "SSHPowerDriver requires both address and username be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:149
+#: ironic/drivers/modules/ssh.py:122
msgid "SSHPowerDriver requires either password or key_filename be set."
msgstr ""
-#: ironic/drivers/modules/ssh.py:179
+#: ironic/drivers/modules/ssh.py:153
#, python-format
msgid "Node \"%(host)s\" with MAC address %(mac)s not found."
msgstr ""
-#: ironic/drivers/modules/ssh.py:199
+#: ironic/drivers/modules/ssh.py:174
#, python-format
msgid "Retrieved Node List: %s"
msgstr ""
-#: ironic/drivers/modules/ssh.py:204
+#: ironic/drivers/modules/ssh.py:179
#, python-format
msgid "Checking Node: %s's Mac address."
msgstr ""
-#: ironic/drivers/modules/ssh.py:218
+#: ironic/drivers/modules/ssh.py:193
#, python-format
msgid "Found Mac address: %s"
msgstr ""
@@ -1073,6 +1032,32 @@ msgstr ""
msgid "Failed to understand rule %(rule)r"
msgstr ""
+#: ironic/openstack/common/processutils.py:127
+#, python-format
+msgid "Got unknown keyword args to utils.execute: %r"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:142
+#, python-format
+msgid "Running cmd (subprocess): %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:167
+#: ironic/openstack/common/processutils.py:240
+#, python-format
+msgid "Result was %s"
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:179
+#, python-format
+msgid "%r failed. Retrying."
+msgstr ""
+
+#: ironic/openstack/common/processutils.py:219
+#, python-format
+msgid "Running cmd (SSH): %s"
+msgstr ""
+
#: ironic/openstack/common/processutils.py:221
msgid "Environment not supported over SSH"
msgstr ""
@@ -1184,36 +1169,59 @@ msgstr ""
msgid "Unknown byte multiplier: %s"
msgstr ""
-#: ironic/openstack/common/db/exception.py:44
+#: ironic/openstack/common/db/exception.py:42
msgid "Invalid Parameter: Unicode is not supported by the current database."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:487
+#: ironic/openstack/common/db/sqlalchemy/session.py:553
msgid "DB exception wrapped."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:538
+#: ironic/openstack/common/db/sqlalchemy/session.py:616
#, python-format
msgid "Got mysql server has gone away: %s"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/session.py:610
+#: ironic/openstack/common/db/sqlalchemy/session.py:697
#, python-format
msgid "SQL connection failed. %s attempts left."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:33
+#: ironic/openstack/common/db/sqlalchemy/utils.py:60
msgid "Sort key supplied was not valid."
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:72
+#: ironic/openstack/common/db/sqlalchemy/utils.py:99
msgid "Id not in sort_keys; is sort_keys unique?"
msgstr ""
-#: ironic/openstack/common/db/sqlalchemy/utils.py:120
+#: ironic/openstack/common/db/sqlalchemy/utils.py:121
msgid "Unknown sort direction, must be 'desc' or 'asc'"
msgstr ""
+#: ironic/openstack/common/db/sqlalchemy/utils.py:196
+#, python-format
+msgid ""
+"Please specify column %s in col_name_col_instance param. It is required "
+"because column has unsupported type by sqlite)."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:202
+#, python-format
+msgid ""
+"col_name_col_instance param has wrong type of column instance for column "
+"%s It should be instance of sqlalchemy.Column."
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:282
+#, python-format
+msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
+msgstr ""
+
+#: ironic/openstack/common/db/sqlalchemy/utils.py:303
+msgid "Unsupported id columns type"
+msgstr ""
+
#: ironic/openstack/common/notifier/api.py:129
#, python-format
msgid "%s not in valid priorities"
@@ -1701,3 +1709,14 @@ msgstr ""
#~ msgid "IPMI credentials not supplied to IPMI driver."
#~ msgstr ""
+#~ msgid "Unexpected error while running command."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(description)s\n"
+#~ "Command: %(cmd)s\n"
+#~ "Exit code: %(exit_code)s\n"
+#~ "Stdout: %(stdout)r\n"
+#~ "Stderr: %(stderr)r"
+#~ msgstr ""
+