summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
* | | | | | | | Merge "Fix mocks not being stopped as intended"Jenkins2015-04-081-10/+15
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix mocks not being stopped as intendedJohn L. Villalovos2015-04-071-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mock objects were being created that were intended to be started and stopped. But they were not actually being stopped. Fix it so they are being stopped correctly, add autospec=True to the mock objects, and update some side_effects to work with autospec=True. Change-Id: I4ced8eb8a4fe874405f0b53132a38e276eef01b5
* | | | | | | | Merge "Imported Translations from Transifex"Jenkins2015-04-085-708/+1221
|\ \ \ \ \ \ \ \
| * | | | | | | | Imported Translations from TransifexOpenStack Proposal Bot2015-04-085-708/+1221
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For more information about this automatic import see: https://wiki.openstack.org/wiki/Translations/Infrastructure Change-Id: I257164aecf024684ced41b2501c134a024bf45ee
* | | | | | | | Merge "Add maintenance check before call do_node_deploy"Jenkins2015-04-082-10/+12
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add maintenance check before call do_node_deployZhenguo Niu2015-04-082-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if we set provision state to active or rebuild, there is no maintenance check before signal to conductor, so add the check on api side to save a rpc call. Closes-Bug: #1441413 Change-Id: I2898b874b92f865d7e566fac0ede568d1b6c3831
* | | | | | | | Merge "tests/db: Add autospec=True to mocks"Jenkins2015-04-082-12/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | tests/db: Add autospec=True to mocksJohn L. Villalovos2015-04-062-12/+12
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the tests in ironic/tests/db/ add autospec=True to the mocks. Using autospec=True helps to ensure that the mock object does not get called with misspelled function names. Change-Id: I8f66174c7f69fbb130acdaae50f4381c8152d0e3
* | | | | | | | Merge "boot_mode is overwritten in node properties"Jenkins2015-04-0810-149/+127
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | boot_mode is overwritten in node propertiesShivanand Tendulker2015-04-0710-149/+127
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | iLO drivers overwrite boot_mode in the node's properties/capabilities when UEFI secure boot is requested. Closes-Bug: 1436791 Change-Id: I9b6cf288b34707a8a1d5d99a95f2bc9f6bf380f1
* | | | | | | Merge "Fix VM stuck when deploying with pxe_ssh + local boot"Jenkins2015-04-082-0/+37
|\ \ \ \ \ \ \
| * | | | | | | Fix VM stuck when deploying with pxe_ssh + local bootLucas Alvares Gomes2015-04-072-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deploying a machine with the DIB ramdisk, pxe_ssh driver and local boot the VM will keep rebooting forever after the deployment is completed. This happens because Ironic will change the boot device from PXE to DISK as part of the deployment but the change will only take effect after the VM is powered off and on again (that's a virsh problem). This patch is fixing this problem by making Ironic reboot the machine after the deployment is completed (reboot in Ironic means power it off and on again). Closes-Bug: #1439664 Change-Id: I4aa859b00a8bba186e920e09734ec2e4c45dec3e
* | | | | | | | Merge "Fix bad quoting in quickstart guide"Jenkins2015-04-081-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bad quoting in quickstart guideJay Faulkner2015-04-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the " and ' in the message was rendering into smart quotes, making copy+paste impossible. This fix places the commands inside the note into a blockquote, preventing sphinx from breaking copy+paste. Change-Id: I7291f7cbdb9c7fa16d23376792012a7a70c7c16b
* | | | | | | | | Merge "Set hash seed to 0 in gendocs environment"Jenkins2015-04-081-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Set hash seed to 0 in gendocs environmentJay Faulkner2015-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in the venv environment to fix docs builds in the gate, but they still fail randonly locally when using the tox environment to build them. This change ensures the gendocs environment works for generating documentation locally. Change-Id: I41e4af9edaaa76b837a6c92a296b5738c85b632b
* | | | | | | | | Merge "Sync with oslo.incubator"Jenkins2015-04-084-8/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sync with oslo.incubatorGhe Rivero2015-04-064-8/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add oslo.policy and oslo.concurrency to oslo config generator extra libraries to retrieve config options Update oslo_incubator service module Update oslo_incubator versionutils with new list_opts discovery Change-Id: I5558f6f9f708b1643ebd6c8b2a213a1fae582a50
* | | | | | | | | | Merge "Update doc for test database migrations"Jenkins2015-04-081-9/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update doc for test database migrationsYuriy Zveryanskyy2015-04-011-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated information which is not valid now. Change-Id: I0222fe4a9978cb706fab35478943e79f78c3abed
* | | | | | | | | | | Merge "Shorten time for unittest test_download_with_retries"Jenkins2015-04-071-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Shorten time for unittest test_download_with_retriesJohn L. Villalovos2015-04-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unit test: ironic.tests.test_glance_service.TestGlanceImageService.test_download_with_retries was taking over 1 second to complete. After mocking time.sleep the unit test no longer shows up in the slowest test list. Change-Id: I060f1e9632efff5a57e43aac273669211fb44f0a
* | | | | | | | | | | Merge "Check status of bootloader installation for DIB ramdisk"Jenkins2015-04-078-46/+379
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Check status of bootloader installation for DIB ramdiskRamakrishnan G2015-04-078-46/+379
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a new vendor passthru 'pass_bootloader_install_info' for DIB ramdisk to notify the status of boot loader installation. The same change is made for both pxe_* drivers and iscsi_ilo driver. Closes-Bug: 1422723 Depends-on: I9c1d8643be7cb9e273d65ddd791715a5c271fd93 Change-Id: I9944b6835e42cc9b282b7a7b90191a18d00f2e38
* | | | | | | | | | Merge "Document ports creating configuration for in-band inspection"Jenkins2015-04-071-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document ports creating configuration for in-band inspectionDmitry Tantsur2015-04-031-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia885b4cf81fc8fb6e25f5a34e15247e77dc963db
* | | | | | | | | | | Merge "Fix help string for glance auth_strategy option"Jenkins2015-04-072-4/+15
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix help string for glance auth_strategy optionVladyslav Drok2015-04-032-4/+15
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help for Glance auth_strategy config option is incorrect, this change fixes it. Change-Id: I0749477118930794942d8ccb6cfc043d92dc1a62