summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Adds tests to xenapi.vm_utils's 'lookup' method"Jenkins2013-04-221-0/+30
|\
| * Adds tests to xenapi.vm_utils's 'lookup' methodMatthew Sherborne2013-04-201-0/+30
| | | | | | | | Change-Id: I140f091b50c3e4076d3f4812cae00e37f120a277
* | Merge "Stop vm_state reset on reboot of rescued vm"Jenkins2013-04-222-4/+27
|\ \
| * | Stop vm_state reset on reboot of rescued vmMatthew Sherborne2013-04-192-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a VM is in rescue mode, giving it a reboot will reset its state in the DB back to ACTIVE. This patch stops that happening. Work towards bug: 1170237 Change-Id: Ie442bcc85ed7ad5d897b88ffd0dbcf6eeee7b990
* | | Merge "Cleanup and test volume usage on volume detach"Jenkins2013-04-223-28/+83
|\ \ \
| * | | Cleanup and test volume usage on volume detachMichael Kerrin2013-04-163-28/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor _poll_volume_usage to be more readable * Test that detaching a volume updates the totals on the volume usage cache correctly. This works but adding test to make sure that it always works. Change-Id: I82da44137bc65d5f04bca0820eb327438d6e1f35
* | | | Merge "Delete extra space to api/volumes message"Jenkins2013-04-221-1/+1
|\ \ \ \
| * | | | Delete extra space to api/volumes messageYou Ji2013-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I04efa9c8ddb5790f99d66c302198bf92000f6e66 Signed-off-by: You Ji <jiyou09@gmail.com>
* | | | | Merge "baremetal: Change input for sfdisk"Jenkins2013-04-221-1/+1
|\ \ \ \ \
| * | | | | baremetal: Change input for sfdiskArata Notsu2013-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent sfdisk stopping with "bad input", use a empty string instead of "-" (and doing so requires using "," as a separator). Fixes bug 1166112 Change-Id: I5e4cffaa326fbafd1583d55744f921a40b3ae76f
* | | | | | Merge "Raise correct exception for duplicate networks"Jenkins2013-04-222-9/+23
|\ \ \ \ \ \
| * | | | | | Raise correct exception for duplicate networksBen Nemec2013-04-082-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using Quantum, if duplicate network ids are passed in on a nova boot, nova-api raises a NetworkNotFound exception, which is not correct. This change causes it to raise a NetworkDuplicated exception instead. Fixes bug 1165088 Change-Id: I4f1f9aa5e1fa0e740b78e67760d924e2dd1d4d98
* | | | | | | Merge "baremetal: VirtualPowerDriver uses mac addresses in bm_interfaces"Jenkins2013-04-222-9/+16
|\ \ \ \ \ \ \
| * | | | | | | baremetal: VirtualPowerDriver uses mac addresses in bm_interfacesArata Notsu2013-04-152-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the change I6653829364b0a641442d45e766493180d6f2a880, bm_nodes.prov_mac_address is no longer set. However VPD still uses it. This patch changes VPD to use bm_interfaces.address instead of bm_nodes.prov_mac_address. Fixes bug 1168574. Change-Id: I2bab869b282958ee9fd0e4776928e56351018324
* | | | | | | | Merge "Remove unnecessary method argument."Jenkins2013-04-221-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary method argument.Yaguang Tang2013-04-221-1/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'self' argument is unnecessary and when the the method is invoked, cause parameters error. Fix bug #1171376 Change-Id: I612b466a955cb8418855849119599222ba6479d3
* / | | | | | | Improve Python 3.x compatibilityDirk Mueller2013-04-2234-95/+95
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bit of mechanical translation to clean out the deprecated except x,y: construct Change-Id: I80883b6b0c014bdf4799e8b7b2c4a4a07d951a0b
* | | | | | | Merge "Sync rpc from oslo-incubator."Jenkins2013-04-2013-16/+257
|\ \ \ \ \ \ \
| * | | | | | | Sync rpc from oslo-incubator.Russell Bryant2013-04-1413-16/+257
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes rpc api namespace support, some minor configuration related fixes, and the redis based matchmaker for use with impl_zmq. Change-Id: I9fc826a498461417afe8b2a923edac8d68c2c18f
* | | | | | / Imported Translations from TransifexOpenStack Jenkins2013-04-2022-997/+730
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Change-Id: Ib7dd5ace2eaf2060ea0a65ff9100a1fdbc10ccdf
* | | | | | Merge "Don't swallow PolicyNotAuthorized for resize/reboot actions"Jenkins2013-04-193-21/+40
|\ \ \ \ \ \
| * | | | | | Don't swallow PolicyNotAuthorized for resize/reboot actionsAndrew Laski2013-04-183-21/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes 'except Exception' lines in the api which were preventing PolicyNotAuthorized exceptions from bubbling up and returning 403 to the caller. This addresses policy exceptions in confirmResize, revertResize, and reboot. The try block calls into the compute api which sends a cast to perform to bulk of the work, so there is little chance of an exception bubbling up which is not already being caught. Removes a unit test for a condition that should not exist. Bug 1170453 Change-Id: I516a19894ab3d183057c774e84c4faa7053a6463
* | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1922-2091/+1997
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie208685045a154bc4f27706ae0c27d5de155a108
* | | | | | | Remove unused exception and variable from scheduler.Alvaro Lopez Garcia2013-04-182-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no cost functions, so there is no cache and no Exception to be raised. Change-Id: I4a67bd45e3f0c91e5507ed3794dc20b13292596b
* | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1822-529/+529
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib960a546f1d7acff887f89410558e49d67b9ae26
* | | | | | Merge "removing unused variable from a test"Jenkins2013-04-171-1/+0
|\ \ \ \ \ \
| * | | | | | removing unused variable from a testtilottama gaat2013-04-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b5613ae756bac794f82dec4abfa1361efac4054
* | | | | | | Merge "Remove orphaned db method instance_test_and_set"Jenkins2013-04-171-9/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove orphaned db method instance_test_and_setHans Lindgren2013-04-151-9/+0
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 86544fad81f95b74407a76bea8b081f490e2832f removed the only use of this method together with the sqlalchemy implementation of it but forgot to remove it from db.api. Change-Id: I751f99ee64cdeab56f1f3fd9f846157f241804a2
* | | | | | Merge "Added comments to quantum api client"Jenkins2013-04-171-4/+32
|\ \ \ \ \ \
| * | | | | | Added comments to quantum api clientVic Howard2013-04-161-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a few comments for bug 1020184 Change-Id: I6bc59b5b8b57685aae461e5b1111d8dbd168123d
* | | | | | | Merge "Fix bug in os-availability-zone extension."Jenkins2013-04-172-12/+31
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix bug in os-availability-zone extension.Andrea Rosa2013-04-112-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1167956. The call to get the list of availability zones (GET V2/os-availability-zone) doesn't hide internal availability zone if all services in that zone are disabled. Change-Id: I2c49ad68c2ee5ddea0536dfa770f649fbb392b63
* | | | | | | Merge "xenapi: Make _connect_volume exc handler eventlet safe"Jenkins2013-04-161-4/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | xenapi: Make _connect_volume exc handler eventlet safeRick Harris2013-04-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `forget_sr` blocks and so clears the exception state causing the subsequent raise to try to raise `None`, which fails. Fixes bug 1167515 Change-Id: I18562c7389b152a6490d352c5a8d36934288f47d
* | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-04-1522-2162/+2135
|\ \ \ \ \ \ \
| * | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1522-2162/+2135
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I01693e36efa67457c5d5963a430d590bd2903908
* | | | | | | Merge "Add NOVA_LOCALEDIR env variable"Jenkins2013-04-153-7/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add NOVA_LOCALEDIR env variableMark McLoughlin2013-04-103-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of fixing bug #995287 Syncs these two commits from oslo-incubator: Support overriding oslo localedir too Add a gettextutils.install() helper function to get a new gettextutils.install() function which allows the default localedir to be overwritten via an environment variable. Note that gettextutils.install() must be called before any other nova modules are imported since some modules attempt to translate strings at import time (e.g. the 'message' attributes on classes in nova.exception). This is broken and inefficient, but fixing it involves adding something like spinx's l_() function and would be very invaisve. Also, note that calling gettextutils.install() in nova.cmd.__init__ means that no program which uses a different translation domain should ever import any of the modules under nova.cmd. Change-Id: I86562b3a65d371673bb21f7179eecc7602bc0775
* | | | | | | Merge "Make sure confirm_resize finishes before setting vm_state to ACTIVE"Jenkins2013-04-142-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Make sure confirm_resize finishes before setting vm_state to ACTIVEHans Lindgren2013-04-132-4/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting it to ACTIVE to early will allow new resize or whatever operations to start before the current confirm has finished which might result in all sorts of conflicts. Resolves bug 1161529 where an intermittent failure in a tempest test happens because a confirm operation conflicts with a later resize carried out on the same instance. As the new resize starts to move around instance disks, the still not finished confirm operation might fail at recalculating total disk usage due to a missing disk. Other possible conflicts might be due to system_metadata and/or quota not being up-to-date at the moment the instance becomes ACTIVE. Change-Id: I079da4e271469739504fa87e23149d03652d98f0
* | | | | | | Merge "Make compute/manager use conductor for unrescue()"Jenkins2013-04-146-4/+27
|\ \ \ \ \ \ \
| * | | | | | | Make compute/manager use conductor for unrescue()Dan Smith2013-04-126-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compute_api.unrescue() call makes direct database queries, which means it can't be called directly from compute manager. This patch adds support in conductor for proxying this request and makes compute manager utilize it. Fixes bug 1167619 Change-Id: I158c64cabdfe436462f5669047fb930819a13c50
* | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1422-4247/+4274
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Change-Id: I1b7a045d7b9bd96200c4508043cdd18c8a96fa5d
* | | | | | | Merge "Add an extension to show the mac address of a ip in server(s)"Jenkins2013-04-1235-16/+796
|\ \ \ \ \ \ \
| * | | | | | | Add an extension to show the mac address of a ip in server(s)Zhi Yan Liu2013-04-1235-16/+796
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extension adds the OS-EXT-IPS-MAC:mac_addr param so that users can associate the mac address to the ip of the server in one API call. Implement bp: os-ext-ips-mac-api-extension DocImpact Change-Id: I01d0b3aa804b5218853a4bb568c85e31b87d04e4 Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
* | | | | | | Merge "Define LOG globally in baremetal_deploy_helper"Jenkins2013-04-121-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Define LOG globally in baremetal_deploy_helperArata Notsu2013-04-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since LOG = getLogger() has been moved from the global scope to the function scope (main), the rest of the module could not find LOG. This patch makes LOG global again. Fixes bug 1165262 Change-Id: I2607802dcbed64135f75011a02ebce95519e4ea1
* | | | | | | | Merge "Allow for the power state interval to be configured."Jenkins2013-04-121-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow for the power state interval to be configured.Joshua Harlow2013-04-111-1/+6
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The power state interval right now is hard coded to 600 seconds. In order to allow deployers to change this timing (and determine) the side-effects of that change it is useful to allow this value to be configured instead of static. DocImpact Change-Id: I9baf34f9b132dc20fcc096f86fa0e5794fc06312