summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Clean up release notes for 6.2.0"6.2.0stable/newtonJenkins2016-09-2116-45/+39
|\
| * Clean up release notes for 6.2.0Jim Rollenhagen2016-09-2116-45/+39
| | | | | | | | | | | | | | | | | | This is cleaned up as of commit 2351d624aed7aae9d58ce37676c0181687be0e8a, and should be sufficient for the final release. If something else with a release note lands, we can make any changes there in a later patch. Change-Id: Ia1ef442f3cc0d64c8a7c6fbb5aaf3f0160f214de
* | Merge "DRAC: list unfinished jobs"Jenkins2016-09-214-0/+71
|\ \
| * | DRAC: list unfinished jobsImre Farkas2016-09-214-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | After set_bios_config is invoked, there is no way to check the progress of the remote job on the DRAC card. list_unfinished_jobs on the vendor-passthru interface provides a way to check its status. Change-Id: I963504dbbec36e44312ccbf4455c45d6ec60908b Closes-Bug: #1621515
* | | Merge "Add a note about security groups in install guide"Jenkins2016-09-211-1/+15
|\ \ \
| * | | Add a note about security groups in install guideJim Rollenhagen2016-09-201-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a note that network security must be disabled, or certain ports must be allowed, for provisioning and cleaning networks. Closes-Bug: #1622727 Change-Id: I8415591d31209f8e3fbd9a4dcce30bd64bf8b24b
* | | | Merge "Sync ironic-lib.filters from ironic-lib"Jenkins2016-09-211-0/+2
|\ \ \ \
| * | | | Sync ironic-lib.filters from ironic-libDmitry Tantsur2016-09-211-0/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | For now we have to carry both in both trees, and they have gone out of sync. This changes updates the copy here with two new commands. Change-Id: Ife131cf825518012a3b04d2c7d713beeb4f8f770
* | | | Fix broken unit tests for get_ilo_objectDmitry Tantsur2016-09-211-3/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, the tested function signature was wrong. We didn't catch it in gate, as we mock proliantutils, but it does break e.g. Debian package build. Second, the arguments override was not actually working. We didn't catch it in gate, because the new values were the same as the defaults. Closes-Bug: #1626089 Change-Id: I2e4899e368b0b882dcd59bf33fdca98f47e5b405
* | | Remove websockify from requirementsClint Byrum2016-09-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has never been needed by Ironic, and likely never will. It drags in numpy, and makes the whole of Ironic that much more bloated. The requirement was first added in 84a7dc47e2f666ff11b5816387b7ada2371e48c2 and was presumably copied from Nova whilst forking Ironic. Change-Id: Ied4591e38cbe151b9c2fbca28ec9d006ed4afcfb
* | | Merge "Refactor common checks when instantiating the ipmitool classes"Jenkins2016-09-201-32/+16
|\ \ \
| * | | Refactor common checks when instantiating the ipmitool classesLucas Alvares Gomes2016-09-191-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructor for the ipmitool classes are the same but they are duplicated all over this patch is refactoring that code into a common function that can be called from the classes constructors. The VendorPassthru class wasn't checking for the 'timing' option support of the ipmitool command, it should, this patch is fixing that too. Change-Id: I456dbb9ef11230d722ff1b1fe5aa142237e0d187
* | | | Merge "Deprecate ClusteredComputeManager"Jenkins2016-09-202-1/+30
|\ \ \ \
| * | | | Deprecate ClusteredComputeManagerJim Rollenhagen2016-08-102-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of nova's Newton release, the ironic virt driver supports multiple compute hosts without using the hack we call ClusteredComputeManager. Deprecate it so we can remove it in Ocata. Change-Id: I9c44429666734e5bdbe60b3ff8bba787ff99a6d1
* | | | | Merge "Update proliantutils version required for Newton release"Jenkins2016-09-203-3/+9
|\ \ \ \ \
| * | | | | Update proliantutils version required for Newton releaseAparna2016-09-153-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the proliantutils version required in Ironic to 2.1.11 for Newton release. This version of proliantutils fixes the bug caused by python request library version 2.11.0. It also includes defect fixes for Proliant Gen7 support and iLO based RAID configuration. Change-Id: I4b42686496a03751b4136614af7f3ba0753bbf73
* | | | | | Merge "Remove unnecessary setUp"Jenkins2016-09-202-6/+0
|\ \ \ \ \ \
| * | | | | | Remove unnecessary setUpzhufl2016-09-202-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setUp will be automatically called around each testcase, so this is to remove setUp that doing nothing additional than super to keep code clean. Change-Id: I8ce1dd0cc0cbba760caa6df6516b300622bb67fe
* | | | | | | Merge "Grub2 by default for PXE + UEFI"Jenkins2016-09-205-30/+55
|\ \ \ \ \ \ \
| * | | | | | | Grub2 by default for PXE + UEFILucas Alvares Gomes2016-09-195-30/+55
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is changing the default bootloader for PXE + UEFI to Grub2. Prior to this patch Elilo was the default but, Elilo is no longer maintained with the last release dating 2014. Ironic should have sane defaults therefore we should not rely on an unmaintained project. Change-Id: Ib34fcbd37e4698bf272582c96b1540b511b5a892
* | | | | | | Merge "Notification event types have status 'error'"Jenkins2016-09-201-2/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Notification event types have status 'error'Ruby Loo2016-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the documentation to indicate that the notification event types can have status 'error'. 'fail' is incorrect. (https://github.com/openstack/ironic/blob/11fcf6b710857f01f6b2a7b3fbed28caabba2594/ironic/objects/notification.py#L48) Change-Id: I13c3f40430a4d7f8c07fdd9861b2d8712b8247a6
* | | | | | | Merge "Adds a missing space in a help string"Jenkins2016-09-202-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Adds a missing space in a help stringRuby Loo2016-09-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a missing space int he default_boot_mode configuration option's help string. Change-Id: I08cbbc04b7ee636e6a62ed28dd355303d2ae525f
* | | | | | | | Remove duplicated line wrt configdriveRuby Loo2016-09-191-1/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 1027c1bc44912fcbfb9f842fedef39c9067632f8 introduced a line that was already being done (line 1212). This removes the duplicated line. Change-Id: I0d05ecb1236dc68995f47204b686fe398b177f79 Partial-Bug: #1493328
* | | | | | | Merge "Support configdrive in iscsi deploy for whole disk images"Jenkins2016-09-197-6/+80
|\ \ \ \ \ \ \
| * | | | | | | Support configdrive in iscsi deploy for whole disk imagesShivanand Tendulker2016-09-187-6/+80
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will work for UEFI only or BIOS only images. It will not work for hybrid images; which are capable of boot from BIOS and UEFI boot mode. Partial-Bug: #1493328 Change-Id: I9a0775a147d5bac711b58b4b6cf0135ec68509f7
* | | | | | | Merge "Fix test syntax error in devstack/lib/ironic"Jenkins2016-09-191-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix test syntax error in devstack/lib/ironicJohn L. Villalovos2016-09-151-2/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test conditional was not using [[ ]] for the if statement conditional. We can use '&&' inside [[ ]]. So put all the tests inside the one [[ ]] block. Change-Id: I4c8cb7a3a49f5e00ec638bd1fd1d9eb4931b97a1
* | | | | | | Merge "Fix docstrings in Tempest Plugin REST client for Ironic API"Jenkins2016-09-191-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Fix docstrings in Tempest Plugin REST client for Ironic APIKyrylo Romanenko2016-09-141-4/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix misprints in docstrings. Change-Id: I68a6f98a626acccb404fb3088e7533e8340473da
* | | | | | | Merge "Allow using TempURLs for deploy images"Jenkins2016-09-196-127/+240
|\ \ \ \ \ \ \
| * | | | | | | Allow using TempURLs for deploy imagesPavlo Shchelokovskyy2016-09-076-127/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when iPXE is enabled, it is possible for the bootloader to download the deploy kernel and ramdisk directly from Swift TempURL instead of downloading them to conductor and serving from local HTTP server. This patch adds the required logic and a new config option `ipxe_use_swift` (default False), setting which to True enables using Swift TempURLs for deploy ramdisk and kernel. Note that local caching and serving for kernel and ramdisk of user image is still performed for partition images that require non-local boot, as moving those to use TempURLs will make it impossible for the user to reboot the instance when TempURLs time out or image is deleted from Glance/Swift. Change-Id: I106cc6148c329e784bfbb5019fdfeb0509a9de09 Closes-Bug: #1526404 Co-Authored-By: Andrey Shestakov <ashestakov@mirantis.com>
* | | | | | | | Merge "Use assertEqual() instead of assertDictEqual()"Jenkins2016-09-191-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Use assertEqual() instead of assertDictEqual()Luong Anh Tuan2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In unittesttools, assertDictEqual() and assertEqual() are implemented by using '!=' operator. But assertEqual() can handle dict, list, set and so on. So we just call assertEqual() to make the tests simpler. Change-Id: Id59455c036f27130778a40fd791e52e5933c4813
* | | | | | | | Merge "[trivial] Fix typo in docstring"Jenkins2016-09-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [trivial] Fix typo in docstringKyrylo Romanenko2016-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie142198b868d91f386319bdc253f7be34dedc55b
* | | | | | | | | Merge "Separate WSGIService from RPCService"Jenkins2016-09-199-231/+305
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Separate WSGIService from RPCServiceRuby Loo2016-09-159-231/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem which prevented Ironic from honoring the interval values configuration for the periodic tasks. Since the interval values are passed to a decorator, the configuration options should be evaluated prior to importing the module which contains the periodic tasks. In our case this was not happening due to the chain of imports going from ironic.cmd.conductor -> ironic.common.service -> ironic.api.app -> ... -> ironic.conductor.manager. This caused the @periodic decorators to be evaluated before the configuration options were loaded. This patch breaks that chain of imports by separating the WSGIService and RPCService classes into two separate files. The conductor uses the RPCService, and since it is now in a separate file from WSGIService, it no longer pulls in ironic.api.app, ..., and ironic.conductor.manager. (ironic.api.app was being imported because WSGIService needed it.) Change-Id: Ie318e7bb2d2c2d971a796ab8960be33fccbd88f3 Closes-Bug: #1562258 Co-Authored-By: Lucas Alvares Gomes <lucasagomes@gmail.com>
* | | | | | | | | | Merge "Remove NotificationEventTypeError as not needed"Jenkins2016-09-193-7/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Remove NotificationEventTypeError as not neededJohn L. Villalovos2016-09-163-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The exception NotificationEventTypeError was used when an invalid status was used. But it is not possible to assign an invalid status without causing a ValueError. Add a unit test to show that changing status to an invalid value does raise a ValueError. Remove check for valid status value. Change-Id: I58fb50f963ca4a8e8d0185b9165c9bcda3bb7a25
* | | | | | | | | | Merge "Replace "phase" with "status" in notification base"Jenkins2016-09-166-22/+55
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Replace "phase" with "status" in notification baseMario Villaplana2016-09-156-22/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The notification spec is being updated to rename "phase" to "status" and make it a required field. This updates the notification base code and docs to reflect this modification. Version for the notification EventType base class is also bumped. Change-Id: I11b6ea44a01d2a830b592784ccc63a1de9bf2ec1 Depends-On: Ib25bd5a3a600c13f7b265d86ad253af3dfa5552f
* | | | | | | | | | Merge "Mark untested drivers as unsupported"Jenkins2016-09-164-0/+90
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Mark untested drivers as unsupportedJim Rollenhagen2016-09-164-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will cause them to log a warning at startup, that it is unsupported and may be removed later. The drivers marked unsupported are any driver that uses: * SSHPower / SSHManagement * NativeIPMIPower / NativeIPMIManagement * seamicro.Power / seamicro.Management * IBootPower * SNMPPower * VirtualBoxPower / VirtualBoxManagement * AMTPower / AMTManagement * MSFTOCSPower / MSFTOCSManagement * WakeOnLanPower See the release note in this change for the full list of the setup.cfg names for the drivers. The remaining drivers are tested via OpenStack CI, and/or have a third-party CI listed here[0] and are making an honest effort toward having stable CI. [0] https://wiki.openstack.org/wiki/ThirdPartySystems Closes-Bug: #1526410 Change-Id: I9c09be6b7a734426a4c0b18cb61ece5389428cd5
* | | | | | | | | | | Merge "Configure clean network to provision network"Jenkins2016-09-162-12/+23
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Configure clean network to provision networkPavlo Shchelokovskyy2016-09-122-12/+23
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when setting up Ironic with multi-tenancy support, the DevStack plugin by default still sets the cleaning network to the default private network of the demo project, which is not exactly correct. Change the DevStack plugin so that the cleaning network is the same as provisioning network if IRONIC_CLEAN_NET_NAME is not set: - In case of multi-tenancy support enabled, use the created separate provisioning network - w/o multi-tenancy support use the default private network. If the IRONIC_CLEAN_NET_NAME is provided, use that. Change-Id: I9db8f5e3000f05d27a3fa8fc94cfdafe34a6f48a
* | | | | | | | | | Updated from global requirementsOpenStack Proposal Bot2016-09-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I817f473ba5f1a5d93b541634c802e3e84782cbd6
* | | | | | | | | | Fix link from doc index to user guideJim Rollenhagen2016-09-151-1/+1
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6687e5c4f3c6798b93bf8e3f897511980658fb7f
* | | | | | | | | Merge "Fix DRAC failure during automated cleaning"Jenkins2016-09-144-2/+108
|\ \ \ \ \ \ \ \ \