summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | 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
* | | | | | | | | | Merge "Add missing mock for test_create_cleaning_ports_fail"Jenkins2015-04-071-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing mock for test_create_cleaning_ports_failJohn L. Villalovos2015-04-061-1/+3
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test: ironic.tests.dhcp.test_neutron.TestNeutron.test_create_cleaning_ports_fail was taking over two seconds to complete. On failure, it was issuing a call to _rollback_cleaning_ports, which calls Neutron, that was not mocked. Change-Id: I2846061915015960c87f86931c4329ecaf9dbf1e
* | | | | | | | | | Merge "Refactor test code to reduce duplication"Jenkins2015-04-063-32/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Refactor test code to reduce duplicationMichael Davies2015-04-013-32/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of review 163730 a helper method was identified as being duplicated. This patch moves the code to a common location, and updates the users of it to use the new version. There's no functionality change in this patch, just a refactoring. Change-Id: I4a49099c6b8ff3b7078d57a49212f6663d03d698
* | | | | | | | | | Disable XML now that we have WSME/Pecan supportMichael Davies2015-04-069-47/+76
| |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've had a desire to disable XML from the Ironic API for some time, however to do so needed support in WSME/Pecan. That's now been added, so we can implement the Ironic side. To do so, we wrap wsmeext.pecan.expose() and replace all the decorators with a call to ironic.api.expose.expose(). Change-Id: I94d0387722225c4356c867f63b6f1a61356f317d Closes-bug: 1271317
* | | | | | | | | Merge "Add missing test for DB migration 2fb93ffd2af1"Jenkins2015-04-061-4/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add missing test for DB migration 2fb93ffd2af1Yuriy Zveryanskyy2015-04-031-4/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test for increase 'name' column length in nodes table. Change-Id: I1949285d4b8a71602a36c084513d9f85a0be0a8d
* | | | | | | | Merge "Remove DB tests workarounds"Jenkins2015-04-042-17/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove DB tests workaroundsYuriy Zveryanskyy2015-04-032-17/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ironic uses now oslo.db 1.7, workarounds in tests for older versions can be removed. Change-Id: I2f684e5cab86d4902cef3a3798a96dd486e776be
* | | | | | | | Merge "Fix formatting issue in install guide"Jenkins2015-04-041-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix formatting issue in install guideVladyslav Drok2015-04-031-4/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes formatting issue in "PXE Setup" section of installation guide. Change-Id: Iacb13ce81019dbba8a953fed260c0ba78d8c1d88
* | | | | | | | Merge "Enable cleaning by default"Jenkins2015-04-032-12/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable cleaning by defaultDevananda van der Veen2015-04-032-12/+8
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables cleaning by default. It is always safer to erase data after an instance has been deleted, and as such, this is a sane production default. The only potential impact of this option being enabled is that deletion may (depending on hardware) take longer. This commit also updates the help string to describe the only known production situation where disabling this option makes sense -- that is, where there is only a single, trusted tenant. Implements blueprint implement-cleaning-steps Depends-On: I77081165a80491da3e66d8a4554b6d71fc3d9353 Change-Id: I4ed4fbc8c4d88988add953307f8871cbfa33971f
* | | | | | | | Merge "Improve error handling when JSON is not returned by agent"Jenkins2015-04-032-6/+37
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Improve error handling when JSON is not returned by agentJohn L. Villalovos2015-04-032-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the agent is not returning valid JSON in the response. Handle it better and record information about the request and the response to help with debugging. Will now raise an exception similar to this: ironic.common.exception.IronicException: Unable to decode response as JSON. Request URL: http://127.0.0.1:9999/v1/commands Request body: "{"name": "standby.run_image", "params": {"image_info": {"image_id": "test_image"}}}" Response: "this is not json" Change-Id: I483884ca5727fbaa3120e2f7c2b381a7d7e8be17 Closes-Bug: 1439498
* | | | | | | | Merge "Fix is_hostname_safe for RFC compliance"Jenkins2015-04-025-6/+77
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix is_hostname_safe for RFC complianceMichael Davies2015-03-305-6/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the move from Node name supporting just a hostname to now supporting a FQDN, we missed a few changes to keep this function being RFC compliant. This patch enhances the code and tests for this, and migrates the database to the longer name field format. Change-Id: Ib75c8b138d7165aedc74efead80d3fb755cab87b Closes-Bug: #1433832
* | | | | | | | | Merge "New field 'name' not supported in port REST API"Jenkins2015-04-026-155/+314
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | New field 'name' not supported in port REST APIMichael Davies2015-04-016-155/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for referring to nodes by their logical name in the port section of the REST API. As part of this, refactored some code out of node.py into utils.py, along with moving the corresponding tests. Change-Id: I5dd61582e6e009f44dd3eed2ce014d0000c94b19 Closes-Bug: #1431204
* | | | | | | | | | Merge "Fix UnicodeEncodeError issue when the language is not en_US"Jenkins2015-04-022-0/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix UnicodeEncodeError issue when the language is not en_USHaomeng, Wang2015-04-022-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add __str__() method into IronicException base class, and encode to utf-8 to make sure the wsme api can consume/format it as well. Change-Id: I183bbb78d738992ec91dff1ebed698cf84aa06ca Closes-Bug: 1437170
* | | | | | | | | | | Merge "Add display-name option to example apache2 configuration"Jenkins2015-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |