summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Updated from global requirements" into stable/kilo2015.1.0rc22015.1.0Jenkins2015-04-232-6/+6
|\
| * Updated from global requirementsOpenStack Proposal Bot2015-04-232-6/+6
| | | | | | | | Change-Id: I9ef2dce01d94210fa9bec73d4a0181c273d3f874
* | Release Import of Translations from TransifexAndreas Jaeger2015-04-223-109/+123
|/ | | | | | | | | | | | | | | | | | Manual import of Translations from Transifex. This change also removes all po files that are less than 66 per cent translated since such partially translated files will not help users. This updates also recreates all pot (translation source files) to reflect the state of the repository. This change needs to be done manually since the automatic import does not handle the proposed branches and we need to sync with latest translations. This is part of importing of translations, there are no new translations for this project, thus only the pot file gets updated. Change-Id: I0476d5439e461c25f7f66a6dc6e9f0eb74904d61
* Merge "Fix heartbeat when clean step in progress" into stable/kiloJenkins2015-04-222-2/+3
|\
| * Fix heartbeat when clean step in progressJim Rollenhagen2015-04-152-2/+3
| | | | | | | | | | | | | | | | | | | | | | The agent returns command_result of None when a command is in progress. The code assumed it would return an empty dict. Fix the access of command_result to never return None, and fix the tests to reflect reality. Closes-Bug: #1444715 Change-Id: Iae6cd90517cb7b268ce2c089c92f64b09a606a42 (cherry picked from commit 2e2fb8c4997b1cac7dc18e67e43a0d8ba65a79d5)
* | Remove scripts for migrating nova baremetalRuby Loo2015-04-215-428/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In juno, ironic provided support for migrating from nova's "baremetal" driver to its "ironic" driver. These scripts were used for that. The baremetal driver was removed from nova in kilo. Ironic doesn't support migrating from pre-kilo nova's baremetal driver to post-juno nova's ironic driver. Hence, deleting these migration scripts. Closes-Bug: #1446330 Change-Id: Ic4990caa83a2eca3ee9fbd105bfe0a12bdaa7efe (cherry picked from commit 76ab94fcbdddd43278175b8e8421fad0fb72c0cc)
* | update .gitreview for stable/kiloThierry Carrez2015-04-171-0/+1
|/ | | | Change-Id: I521ef3b52745637a7605e8e4c421e7d15164701e
* Merge "Local boot note about updated deploy ramdisk"2015.1.0rc1proposed/kiloJenkins2015-04-131-0/+8
|\
| * Local boot note about updated deploy ramdiskLucas Alvares Gomes2015-04-131-0/+8
| | | | | | | | | | | | | | This patch is adding a note to the local boot documentation about it being dependent upon a updated deploy ramdisk. Change-Id: I16904cd1c9c942239c1416acbe3d8d0ce490d8f2
* | Merge "Cleanup DHCPFactory._dhcp_provider after tests"Jenkins2015-04-131-0/+2
|\ \
| * | Cleanup DHCPFactory._dhcp_provider after testsVictor Sergeyev2015-04-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Set DHCPFactory._dhcp_provider to None after test to allow instantiate a new stevedore.driver.DriverManage for the new DHCPFactory instance. Closes-Bug: #1442081 Change-Id: I19cf6ca009d5c57d3d59a7a128bc8948f3f12b71
* | | Merge "Convert internal RPC continue_node_cleaning to a "cast""Jenkins2015-04-134-26/+16
|\ \ \
| * | | Convert internal RPC continue_node_cleaning to a "cast"Josh Gachnang2015-04-134-26/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The agent driver is using RPCs to call back from the driver to the conductor asynchronously. When using the RPC.call() method, some nodes would end up with stuck locks when using the agent driver during cleaning. The agent driver would issue a call() to continue_node_cleaning() after either the first heartbeat (from prepare_cleaning) or a heartbeat after a clean step had completed. The conductor would attempt to get a lock, but would not be able to. The node would retain its locked state (so far as I could tell), even after the error. Other nodes would continue and complete cleaning just fine. The exception raised by continue_node_cleaning() was likely not caught by the agent driver, but caught by vendor_passthru() in the conductor as an expected exception. Switching to cast() avoids the issue because the errors are not sent back to the caller. I didn't experience any more stuck locks with this change. Change-Id: I4dbb04ccb93199bba4e1a1614bc19b70a068a9ea Closes-Bug: 1442810
* | | | Merge "iLO driver documentation for node cleaning"Jenkins2015-04-132-0/+78
|\ \ \ \
| * | | | iLO driver documentation for node cleaningAnusha Ramineni2015-04-132-0/+78
| | | | | | | | | | | | | | | | | | | | Change-Id: I8b433219b3826fa81397fe01699aa9c1ad09d321
* | | | | Merge "Fix type of value in error middleware response header"Jenkins2015-04-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix type of value in error middleware response headerYuriy Zveryanskyy2015-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apache mod_wsgi is strict about WSGI specification violations, all response headers must be strings. This patch fixes value of 'Content-Length' header. Closes-Bug: #1441014 Change-Id: Iab82cac883efb19886527c35a2cb0055cbe0a6ce
* | | | | Merge "iLO driver documentation for UEFI secure boot"Jenkins2015-04-132-21/+71
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | iLO driver documentation for UEFI secure bootShivanand Tendulker2015-04-122-21/+71
| | |/ / | |/| | | | | | | | | | | | | | Implements: blueprint uefi-secure-boot Change-Id: Iaa264c5476dbfc9ecab5065a78a65298ddd356d5
* | | | Merge "Add Ceilometer to Ironic's Conceptual Architecture"Jenkins2015-04-131-2/+2
|\ \ \ \
| * | | | Add Ceilometer to Ironic's Conceptual ArchitectureMitsuhiro SHIGEMATSU2015-04-131-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Ceilometer can be used with Ironic, so it should be added to "Conceptual Architecture". Change-Id: Id329673da5fb7949a4d464bddd4e1613c3778bcb
* | | | Merge "Improve AMT driver doc"Jenkins2015-04-131-0/+11
|\ \ \ \
| * | | | Improve AMT driver docLin Tan2015-04-131-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is recommended that users should deploy AMT nodes with local boot. Co-Authored-By: Chris Krelle <nobodycam@gmail.com> Close-Bug: #1436824 Change-Id: I536c587008bb68950ec7acfcf16c8ae28f9560bc
* | | | | Merge "Use mock patch decorator for eventlet.greenthread.sleep"Jenkins2015-04-131-2/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use mock patch decorator for eventlet.greenthread.sleepVictor Sergeyev2015-04-091-2/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | eventlet.greenthread.sleep mock patch was not stop anywhere, used decorator to unmock this one. Change-Id: I01d8ffb451c41ea4c212b5d5be30176ea6aa6c13
* | | | Merge "Add notes about upgrading juno->kilo to docs"Jenkins2015-04-102-0/+37
|\ \ \ \
| * | | | Add notes about upgrading juno->kilo to docsAdam Gandelman2015-04-092-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new section to docs to outline special considerations for the juno -> kilo upgrade, specifically around how to upgrade Nova and Ironic together. Change-Id: Idf7efb7438217f5132f6a8581c591a04c76b1abb Closes-bug: #1433727
* | | | | Merge "Update installation service overview"Jenkins2015-04-101-12/+37
|\ \ \ \ \
| * | | | | Update installation service overviewDevananda van der Veen2015-04-091-12/+37
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation service overview Closes-Bug: #1378933 Co-authored-by: SHIGEMATSU Mitsuhiro <shigematsu.mitsuhiro@lab.ntt.co.jp> Co-authored-by: Lucas Alvares Gomes <lucasagomes@gmail.com> Co-authored-by: Dmitry Tantsur <divius.inside@gmail.com> Co-authored-by: John L. Villalovos <john.l.villalovos@intel.com> Change-Id: I407da21faea6052bb415c383ffd7335715f93220
* | | | | Fix for automated boot iso issue with IPA ramdiskShivanand Tendulker2015-04-102-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autogenerated boot iso for iscsi_ilo driver fails when Fedora based IPA ramdisk is used for deploy in UEFI boot mode. The keywords used (linux and initrd) in grub.cfg template are specific to Ubuntu only. They are not recognized by Fedora. Have changed it to keywords (linuxefi and initrdefi) which are recognized by both Ubuntu and Fedora deploy ramdisks. Also the menuentry name has been changed to 'boot_partition' in grub config file. This is done to make it consistent with pxe driver's elilo config file wherein menuentry name for the final boot of user image is 'boot_partition'. Closes-Bug: 1441691 Change-Id: Ia6fdbf4868e6606a18b33ce2b75f29f701a31b35
* | | | | Merge "Nit fixes for boot_mode being overwritten"Jenkins2015-04-104-14/+13
|\ \ \ \ \
| * | | | | Nit fixes for boot_mode being overwrittenShivanand Tendulker2015-04-094-14/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is follow-up patch addressing the comments that were given as part of review I9b6cf288b34707a8a1d5d99a95f2bc9f6bf380f1 Change-Id: Ifeb1581a6391c00f55af0068c99e141b80948cfa
* | | | | Merge "Agent driver fails without Ironic-managed TFTP"Jenkins2015-04-103-18/+101
|\ \ \ \ \
| * | | | | Agent driver fails without Ironic-managed TFTPJosh Gachnang2015-04-093-18/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a lot of assumptions that Ironic has local PXE files. This is untrue for deployments with separate DHCP servers and agent images not hosted in Glance. Adds a new config option 'manage_tftp' in the DCHP section to disable TFTP management. Closes-Bug: #1440896 Change-Id: Ibf5a415e3beee13d12e65e177816256df57cb423
* | | | | | Merge "Address comments on I5cc41932acd75cf5e9e5b626285331f97126932e"Jenkins2015-04-092-2/+4
|\ \ \ \ \ \
| * | | | | | Address comments on I5cc41932acd75cf5e9e5b626285331f97126932eJim Rollenhagen2015-04-092-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bug number to comment, add autospec to mocks, call node.save() in test case. Change-Id: I4cfb934bf88a12351ebee8a1eabcb7fa47378439
* | | | | | | Merge "Follow-up to "Add retry logic to _exec_ipmitool""Jenkins2015-04-092-20/+19
|\ \ \ \ \ \ \
| * | | | | | | Follow-up to "Add retry logic to _exec_ipmitool"Julia Kreger2015-04-092-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to address final review comments and remove unnecessary _time code that was originally only added to the review to mock time which proved unreliable for testing. Original change: I698a8ff1cb70d7758ed05e59b858d9e40708dd05 Change-Id: I109942cec4c84d376c568eba32a57cfb7553a34a
* | | | | | | | Merge "Don't pass boot_option: local for whole disk images"Jenkins2015-04-092-1/+25
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Don't pass boot_option: local for whole disk imagesJim Rollenhagen2015-04-082-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where DIB installs a bootloader on top of the disk image's bootloader. For now, hack boot_option to show as netboot for whole disk images (from DIB's perspective), and fix it for real in Liberty. Change-Id: I5cc41932acd75cf5e9e5b626285331f97126932e Closes-Bug: #1441556
* | | | | | | | Merge "Use hexhyp instead of hexraw iPXE type"Jenkins2015-04-093-11/+61
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Use hexhyp instead of hexraw iPXE typeLucas Alvares Gomes2015-04-083-11/+61
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is using hexhyp instead of hexraw for the type in the iPXE script (boot.ipxe) since hexraw is not supported on older versions of iPXE. When creating a link between the configuration file and the node's mac addresses, we make sure that we generate the 2 versions of it one using the dash as a delimiter (hexhyp) and one without delimiter (hexraw) for backwards compatibility. Closes-Bug: #1441710 Change-Id: I19be3a04e7d53eeb45a67908e34884935dc84a91
* | | | | | | Merge "Fixup post-merge comments on cleaning document"Jenkins2015-04-081-15/+22
|\ \ \ \ \ \ \
| * | | | | | | Fixup post-merge comments on cleaning documentJay Faulkner2015-04-081-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes: Correctly documenting how to see the clean_step that was being executed, and link back to the Ironic state machine for more information on when cleaning runs. Change-Id: Idea77144d9aad9153b8389c41765e57bb4a52978
* | | | | | | | Merge "Fix exception handling in Glance image service"Jenkins2015-04-083-29/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix exception handling in Glance image serviceVladyslav Drok2015-04-083-29/+31
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment there is literally no exception handling in glance_service.base_image_service, as it tries to catch Ironic exceptions instead of Glance client exceptions. This change fixes this behaviour. Change-Id: Iaaeb234c68088538534f2a455f3678079cc60145 Closes-bug: #1441727
* | | | | | | | Merge "Add retry logic to _exec_ipmitool"Jenkins2015-04-082-14/+138
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Add retry logic to _exec_ipmitoolJulia Kreger2015-04-072-14/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using bridged IPMI buses, the possibility exists for the BMC to return messages indicating that it is too busy to service the request at that moment. This results in ipmitool returning an error to the user instead of retrying the operation. As a result of the error being returned, the current operation being attempted by ironic is failed and is never retried as the present retry configuration is purely a pass-through to ipmitool. Added logic to allow for the identification of errors returned by ipmitool that can be retried coupled with logic to retry the failed operation until the configured retry window has passed. Included three tests which are geared to exercise the retry logic and ensure that the retry logic works as expected, including that the retry operations are only performed a specific number of times based on the conditions. Updated one of the pre-existing tests that tested _exec_ipmitool act of returning an exception to ensure that the retry logic is executed only once. Change-Id: I698a8ff1cb70d7758ed05e59b858d9e40708dd05 Closes-Bug: 1431929
* | | | | | | Merge "Update proliantutils version required for K release"Jenkins2015-04-082-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Update proliantutils version required for K releaseRamakrishnan G2015-04-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the proliantutils version required in Ironic to 2.1.0 for K release. This version of proliantutils includes the following functionality: * Enablement of RIS protocol for Proliant Gen9 servers on which uefi secure boot feature depends. * Functionality for node inspection using *ilo drivers. * Functionality for node cleaning. Change-Id: I09db1eca7fb6d383edaeac5da909d9bb84a8a009