summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge "Remove uses of instance['instance_type'] from xenapi driver."Jenkins2013-03-074-34/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove uses of instance['instance_type'] from xenapi driver.Dan Smith2013-03-064-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this includes a fix to tests/db/fakes.py to make the fake instance_type structures look like the database models. This is one change in a series aimed at removing the use of instance-linked instance_type objects, in favor of the decoupled type data in system_metadata. See bug 1140119 for more details. Change-Id: Ieb107fbaf0f3b5a42681aefc0ffdefdb8c0f98a5
* | | | | | | | | | | | | | | Merge "Remove duplicate API logging."Jenkins2013-03-071-13/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove duplicate API logging.Joe Gordon2013-03-061-13/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before each API call logged the same data three times on INFO level. We only need to log the information once. Fix bug 975589 Change-Id: I24131cf9f1c27030ecc99e638e9f4126096a0b96
* | | | | | | | | | | | | | Merge "Remove unnecessary setUp() and tearDown() methods"Jenkins2013-03-0710-35/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove unnecessary setUp() and tearDown() methodsJohannes Erdfelt2013-03-0610-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unnecessary to implement setUp() and tearDown() when they only call the parent class method of the same name. Change-Id: I8a2c7f50e17def87ada8d4f1c1b554eb916afbd1
* | | | | | | | | | | | | | | Tiny typoDavanum Srinivas2013-03-061-1/+1
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | virtualizated -> virtualized Change-Id: Ie5006f2fdd1d6963b35c63e749ffe939d5fb9bcc
* | | | | | | | | | | | | | Merge "Fix instance_system_metadata deleted columns"Jenkins2013-03-062-1/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix instance_system_metadata deleted columnsChris Behrens2013-03-052-1/+81
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration 153 adds instance_type data to sys_meta, but creates entries with the default value of deleted.. which is NULL. This means these entries do not get pulled in on a join when querying an instance, as there is a condition of deleted=0. This converts 'deleted' NULL entries to be 0. Fixes bug 1147839 Change-Id: I3caf92b3992b22089a2653c2e7220585d616a102
* | | | | | | | | | | | | Merge "Don't traceback in the API on invalid keypair."Jenkins2013-03-062-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't traceback in the API on invalid keypair.Russell Bryant2013-03-052-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to get a keypair that did not exist, a traceback would end up in the nova-api log. Handle this exception in the API extension so that it doesn't make a mess of the log. Also add a unit test for this particular scenario. Fix bug 1145545. Change-Id: Id1647d4ac56629c2931099320d271e34fc2f99b9
* | | | | | | | | | | | | | Merge "Fix issues with re-raising exceptions."Jenkins2013-03-069-65/+81
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix issues with re-raising exceptions.Russell Bryant2013-03-059-65/+81
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is complication with re-raising exceptions and our usage of eventlet. If the code in the exception handler accesses the db or rpc in the exception handler, it will no longer be able to re-raise the exception. Using excutils.save_and_reraise_exception() works aorund this issue. The most common error is calling LOG.error() or LOG.exception(), as it is possible for these to go access rpc. There is an option to turn on notifications for these errors. Fix bug 845866. Change-Id: Icfca2af63805711229249aa7abe60a938edd1b35
* | | | | | | | | | | | | | Merge "Updating powervm driver snapshot with update_task_state flow"Jenkins2013-03-064-13/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updating powervm driver snapshot with update_task_state flowDavid Peraza2013-03-044-13/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1136359 Without this change snapshot still works but instance task state does not get updated correctly and nova logs will show expected task state erros from compute manager. Also added a snapshot test. Change-Id: I0f4ed24aa82a66fafc4b6813d017618ae07b4751
* | | | | | | | | | | | | | | Merge "Remove parameters containing passwords from Notifications."Jenkins2013-03-067-118/+174
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove parameters containing passwords from Notifications.Sandy Walsh2013-03-057-118/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compute.manager methods often takes password parameters in methods that are wrapped with exception handlers and notifiers. What can happen is these passwords will get bundled up and sent outside of the system. This patch will strip out any parameter with *_pass* in the name. The side effect of this is that all notification will have the error parameters in the 'args' part of the notification payload. Previously only the positional args were in the 'args' part and keyword args were placed in the payload directly. This may affect consumers of the error notifications. Change-Id: I2e7822eb5416d315ceb690f739e4dba9d52a7954
* | | | | | | | | | | | | | | | Merge "Switch to oslo.config."Jenkins2013-03-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Switch to oslo.config.Dan Prince2013-03-051-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The oslo-config package has been renamed. Switch to the new version. (should fix SmokeStack). Change-Id: I6a0fa803b0076bc5338c996e21bbcef54e1d75cd
* | | | | | | | | | | | | | | Merge "Adjusts reclaim instance interval of deferred delete tests"Jenkins2013-03-061-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adjusts reclaim instance interval of deferred delete testsHans Lindgren2013-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All deferred delete tests set reclaim_instance_interval to 1. This is fine for the test_deferred_delete test that depends on the periodic task _reclaim_queued_deletes to run. For the other tests however, in the unlikely event that the periodic task do run before the tests are done, it will interfere with the tests by terminating the instance in the middle of it. By setting the interval longer than the actual test run, this can be avoided. Resolves bug 1146510. Change-Id: I606cd9f3277cc86cf4f9811da2a10efc7433b9d0
* | | | | | | | | | | | | | | Merge "Rename source_(group_id/ip_prefix) to remote_(group_id/ip_prefix)"Jenkins2013-03-062-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rename source_(group_id/ip_prefix) to remote_(group_id/ip_prefix)Aaron Rosen2013-03-042-6/+6
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1144426 Change-Id: I28735aea05738487861e477aaa3b0a3cec081821
* | | | | | | | | | | | | | | Merge "Moves Hyper-V options to the hyperv section"Jenkins2013-03-067-37/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Moves Hyper-V options to the hyperv sectionAlessandro Pilotti2013-03-057-39/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug: 1140778 Due to the large number of options available in Nova, in order to achieve better option organization and naming (e.g. avoid the hyperv_* prefix) and to avoid option name clashes, options specific to the Hyper-V driver are moved to a section named "hyperv". Backwards compatibility is mantained by providing the "deprecated_group" argument in option definitions. For case consistency the group name as been changed to "hyperv" for options introduced in Grizzly belonging to the group "HYPERV" Change-Id: If2710822cdf6e4ae108a6d1e7977735ac8104a2e
* | | | | | | | | | | | | | | | Merge "Fixes disk size issue during image boot on Hyper-V"Jenkins2013-03-067-55/+170
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixes disk size issue during image boot on Hyper-VAlessandro Pilotti2013-03-047-55/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug: 1135155 The local root disk size provided in the instance flavor was not properly taken into account in the Hyper-V driver, this patches provides a fix for this feature. In order to resize VHD images with differencing disks (CoW), the cached base disk is copied to a new file, which is resized to the size specified in the flavor and cached. This is necessary due to the fact that differencing VHD disks cannot be resized. The procedure described above is applied during image spawn, resize and live migration as needed. Trying to spawn an instance with a local root disk size smaller than the image VHD max. internal size will result in an error. Change-Id: I04f18f0e25c92ed1e1f9f6f18750329a3f9f1711
* | | | | | | | | | | | | | | | Merge "Imporove db.sqlalchemy.api._validate_unique_server_name method"Jenkins2013-03-051-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Imporove db.sqlalchemy.api._validate_unique_server_name methodBoris Pavlovic2013-03-041-13/+13
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is called by instance_create and instance_update. If parameter CONF.osapi_compute_unqiue_server_name_scope is set to 'global' or 'project' then it has terrible performance. Algorithm was next: 1) Get all instances and all connected data (5 joinloads..) in global (or project). 2) Compare hostname with hostnames in instances (locally) Now: 1) Get only count of instances with same hostname in global (or project). 2) If count > 0 raise Exception. Change-Id: I35ea121c3f906b4fff11c38bafa2ab33200bd6b2
* | | | | | | | | | | | | | | Merge "Fix 'to integer' conversion of max and min count values"Jenkins2013-03-052-2/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix 'to integer' conversion of max and min count valuesMauro S. M. Rodrigues2013-03-052-2/+48
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now when you used values non-integer to max_count and/or min_count the coercion worked like: min_count = int(2.5) so min_count received 2 instead of raise bad request. Convert to string before coerce to int solves the problem since int coercion cannot convert from a string which is not a perfect int. Change-Id: Ifaa9910e13614554d1769e71e8eba9587ec5a13b
* | | | | | | | | | | | | | | Merge "Ensure that FORWARD rule also supports DHCP"Jenkins2013-03-053-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Ensure that FORWARD rule also supports DHCPGary Kotton2013-02-283-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix only addressed the INPUT rules and not the FORWARD rule. Adds FORWARD rule to ensure that DHCP traffic is forwarded correctly. Fixes bug 1131223 Change-Id: Ie0d365ba1ba1014bdd2bfc944123c17c4e415d6e
* | | | | | | | | | | | | | | | Merge "Baremetal deploy helper sets ODIRECT."Jenkins2013-03-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Baremetal deploy helper sets ODIRECT.Devananda van der Veen2013-03-041-0/+1
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Baremetal deploy helper should set oflag=direct when dd'ing images onto iSCSI targets, so that it doesn't waste the local page cache. Fixes bug 1114633. Change-Id: Ia674afb34aff7b842cfcd520ecb7b75dc21944fa
* | | | | | | | | | | | | | | | Merge "Rename VMWare to VMware"Jenkins2013-03-052-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Rename VMWare to VMwareSean Chen2013-03-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DocImpact VMware compute drivers include VMwareESXDriver and VMwareVCDriver Change-Id: I2e02560831fbac254d6daf2cb8fbe2c80568ba3a
* | | | | | | | | | | | | | | | | Merge "Standarize ip validation along the code"Jenkins2013-03-057-37/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Standarize ip validation along the codeMauro S. M. Rodrigues2013-03-057-37/+14
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Details: - Use the nova/utils.py validations along the code - refactor ipv4 validator to looks like ipv6 validator - interprets ip validations exceptions as Invalid IP values Change-Id: Ia506c00510a066e167d3dcd9dd371a371129a9dd
* | | | | | | | | | | | | | | | | Merge "Fix an error in compute api snapshot_volume_backed bdm code"Jenkins2013-03-053-94/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix an error in compute api snapshot_volume_backed bdm codeHans Lindgren2013-03-043-94/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stumbled upon an error similar to the one found in https://review.openstack.org/#/c/23354/ where a dbm dict item is tried to be read as an attribute. Looked at the next couple of lines and discovered more cases of this error. Updates to some api tests that contain faulty fakes that hide this error adds some coverage for this error. Rebased this patch on the above mentioned review to be able to change the tests, since the code path is the same and they now hit both of these errors. Resolves bug 1142734. Change-Id: Ie639cd483334b6222085a139159da47ce6fa3671
* | | | | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-03-051-82/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-03-051-82/+95
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8e952faa49f6ec87b18c9c288f3707c4d1a53dc1
* | | | | | | | | | | | | | | | Merge "Prevent reboot of rescued instance."Jenkins2013-03-052-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Prevent reboot of rescued instance.Russell Bryant2013-03-042-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow rebooting an instance in the RESCUED state. This will revert the instance back into an ACTIVE state, which may still be broken. Require an explicit unrescue, instead. Fix bug 1126163. Change-Id: I144163666767923e3beb0a82e687066d1f3a0441
* | | | | | | | | | | | | | | | | Merge "Put options in a list."Jenkins2013-03-051-18/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Put options in a list.Russell Bryant2013-03-041-18/+16
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update nova.notifications configuration options to be in a list, like pretty much everywhere else. For some reason when I saw this it buged me so ... I changed it. Change-Id: I551aba4eaceed2d1a8925e9ab621a030af83eeca
* | | | | | | | | | | | | | | | | Merge "Bump instance updated_at on network change."Jenkins2013-03-053-2/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Bump instance updated_at on network change.Russell Bryant2013-03-043-2/+34
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update add-fixed-ip and remove-fixed-ip code paths to update the updated_at field of the instance, since from the user's perspective through the API, they have made a change to the instance's configuration. In that case, it makes sense to expect that the updated_at field gets changed. Fix bug 1143466. Change-Id: Icfd7d0b1b556795d94a22c1719727f8c9fc744f0
* | | | | | | | | | | | | | | | | Merge "Catching InstanceNotFound exception during reboot instance"Jenkins2013-03-052-12/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |