summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Final versioning for 2011.3.12011.3.1Mark McLoughlin2012-01-191-1/+1
| | | | Change-Id: I444a726c3906f3c25a47b558df4225bda36efe8c
* Merge "Add missing scripts to setup.py (lp#917676)" into stable/diabloJenkins2012-01-171-3/+8
|\
| * Add missing scripts to setup.py (lp#917676)Mark McLoughlin2012-01-171-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If distutils-extra is installed, all scripts are automatically included in the tarball. We should explicitly include them in setup.py to avoid confusion. As an example, the 2011.3 tarballs appear to have been generated with distutils-extra but the 2011.3.1/2012.1 tarballs are now being generated in a venv. So, these newer tarballs are missing scripts which were included in 2011.3. (cherry picked from commit d72109e7114724de668de24800829b07e0d3fe7e) Change-Id: I2a85418b84b93e041f6c7d31833b09acdcb29daa
* | Merge "Bug #894683: nova.service does not handle attribute specific ↵Jenkins2012-01-171-3/+3
|\ \ | |/ |/| | | exceptions and client hangs" into stable/diablo
| * Bug #894683: nova.service does not handle attribute specific exceptions and ↵Armando Migliaccio2012-01-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | client hangs As Sateesh points out nova.service.Service.__getattr__ throws an AttributeError exception when the upcall method is not available. However nova.rpc should catch all exceptions. This does not happen in this specific case because the following statement was outside the try-catch-all: node_func = getattr(self.proxy, str(method)) (cherry picked from commit 421e5cb2b4a3f1b5a8db58543b9cd96df62e9599) Change-Id: I437c88783bca037e4054078d2687ef41c8fc2b83
* | Merge "Fix bug 901899" into stable/diabloJenkins2012-01-171-0/+2
|\ \
| * | Fix bug 901899François Charlier2012-01-161-0/+2
| |/ | | | | | | | | | | | | | | | | If project_id is given when a network is created, it has to be saved in the database. (cherry picked from commit 52de7e6aba5d0c7dac17f2ff5f1fc534eef7492e) Change-Id: I59a05f55202484cfe7910e159d80cd4b5f51dffa
* | Merge "Remove 'location' from GlanceImageService" into stable/diabloJenkins2012-01-173-4/+2
|\ \
| * | Remove 'location' from GlanceImageServiceBrian Waldon2012-01-163-4/+2
| |/ | | | | | | | | | | | | | | | | Glance no longer returns location through its public API, so we should not attempt to display it. Addresses bug 911599. (cherry picked from commit 3e015b869789c7aeeb90e160ede3b3a7b7921f30) Change-Id: I3400006eb6ab94095c0c2d2b5dc90cb9b7775a84
* | Add missing space between XML attributesJohannes Erdfelt2012-01-161-1/+1
|/ | | | | | (cherry picked from commit efc350cbf1658779f4619af72b7acc7858cb8b06) Change-Id: I57be65a6d858acfea64ca4de74bfc0375ef00d1d
* Prepare for the 2011.3.1Mark McLoughlin2012-01-111-2/+2
| | | | | | | | Set version to 2011.3.1, but with final=False See http://wiki.openstack.org/StableBranchRelease Change-Id: I9148ae79d61985d867e5df4880be1970aa0deeff
* Add optional revision field to version numberMark McLoughlin2012-01-111-3/+3
| | | | | | | | | | | Add a revision field to the version number to account for releases from the stable branch, e.g. 2011.3.1. See http://wiki.openstack.org/StableBranchRelease (cherry picked from commit bd035a5a6d2d36102986da491c996f1c17fcda40) Change-Id: I34238a5639d34c9cf44655775a6be80fdd446233
* Do not overwrite project_id from request paramsThierry Carrez2012-01-1117-163/+170
| | | | | | | | | | | | Prevent project_id overwriting from OSAPI request parameters. The patch is actually very simple (nova/api/openstack/wsgi.py) but needs significant test adjustments (nova/tests/*) to pass. Fixes bug 904072. Patch from Vish Ishaya and Mark McLoughlin. (cherry picked from commit c9c09bd60e7a0e0258d218a31d7878755bea1395) Change-Id: I66ea0f178ce6271ec1020e9f1a73bd4e8c83ddab
* Merge "Set instance['host'] to the original host value on revert resize." ↵Jenkins2012-01-112-0/+2
|\ | | | | | | into stable/diablo
| * Set instance['host'] to the original host value on revert resize.Dan Prince2012-01-042-0/+2
| | | | | | | | | | | | Fixes bug #901445 Change-Id: I8c112d92d6a54715073ef1119372d782c3be37c9
* | Cherry-Pick: fix bug 914049: private key in logJoe Gordon2012-01-091-1/+7
| | | | | | | | Change-Id: If9964b8f790077ee9edc88f42ff22e15b31fa540
* | Merge "Add Support to delete VMs in error state." into stable/diabloJenkins2012-01-051-0/+1
|\ \
| * | Add Support to delete VMs in error state.Joe Gordon2012-01-021-0/+1
| |/ | | | | | | | | | | Already supported in master Change-Id: I548474ba5cdbea398d6a7746b5dfcbf026d4d90f
* | Merge "Bug 820059: bin/nova-manage.py VpnCommands.spawn calls non-existant ↵Jenkins2012-01-051-1/+6
|\ \ | | | | | | | | | method VpnCommands._vpn_for - fixed" into stable/diablo
| * | Bug 820059: bin/nova-manage.py VpnCommands.spawn calls non-existant method ↵Ivan Kolodyazhny2012-01-042-1/+7
| |/ | | | | | | | | | | VpnCommands._vpn_for - fixed Change-Id: I86c509d98fac685a5d658f397d0672f71b4bc175
* | Merge "avoid error and trace on dom.vcpus() in lxc" into stable/diabloJenkins2012-01-051-1/+7
|\ \
| * | avoid error and trace on dom.vcpus() in lxcScott Moser2012-01-041-1/+7
| |/ | | | | | | | | | | | | This fixes bug 903943. If you used lxc, you'd eventually see stack traces in nova-compute due to use of dom.vcpus(). Change-Id: I8ff4e973d33eef3df116feb237b2febc8e6a59b5
* | Merge "Pass '-r' option to 'collie cluster status'." into stable/diabloJenkins2012-01-052-1/+5
|\ \
| * | Pass '-r' option to 'collie cluster status'.François Charlier2012-01-042-1/+5
| |/ | | | | | | | | | | | | | | The 'collie cluster status' default output is more verbose since sheepdog 0.24. The '-r' (raw) option has been added for less verbose output but won't be used to ensure compatibility with pre-0.24 sheepdog. Change-Id: Ie31bdded928772250515e439016fc5c5beb00d83
* | Merge "Bug 751229: Floating address range fixed" into stable/diabloJenkins2012-01-052-2/+5
|\ \
| * | Bug 751229: Floating address range fixedIvan Kolodyazhny2012-01-042-2/+5
| |/ | | | | | | Change-Id: I4c7ab8512fe3a00dd555d3a183b2c2348cef9e21
* | Merge "Fixing snapshot failure task_state" into stable/diabloJenkins2012-01-052-2/+32
|\ \
| * | Fixing snapshot failure task_stateDavid Subiros2012-01-042-2/+32
| |/ | | | | | | | | | | | | fixes bug 898162 If a snapshot fails now the instance task_state is set back to None. Change-Id: I5ed8850a35aea901adf253f3f4adc590efd3a075
* | Fix to correctly report memory on Linux 3.X.Mandell Degerness2012-01-041-2/+2
|/ | | | | | | If sys is compiled on a Linux 3.X system, it returns LINUX3 instead of LINUX2 for sys.platform.upper(). Change-Id: I78dae37d4facbaf6513c0eab651b1a06b93949b2
* Merge "Fix RPC responses to allow None response correctly." into stable/diabloJenkins2011-12-234-48/+83
|\
| * Fix RPC responses to allow None response correctly.Chris Behrens2011-12-094-48/+83
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 897155 Cherry picked from 84693b4a16413830be61f465f602de9d13b45161 Also adds a new fake rpc implementation that tests use by default. This speeds up the test run by ~10% on my system. We can decide to ditch fake_rabbit at some point later.. Change-Id: I8877fad3d41ae055c15b1adff99e535c34e9ce92
* | Merge "Bug #886353: Faults raised by OpenStack API Resource handlers fail to ↵Jenkins2011-12-231-0/+3
|\ \ | | | | | | | | | be reported properly" into stable/diablo
| * | Bug #886353: Faults raised by OpenStack API Resource handlers fail to be ↵Ewan Mellor2011-12-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reported properly In Resource.__call__, catch any faults.Fault that are thrown by the request handler, and make those the action_result. This means that the Fault doesn't fall into the exception handler below (faults.Fault is a subclass of webob.exc.HTTPException) and so we don't attempt to wrap a Fault in a Fault. (cherry picked from commit 01150b5d0d482a83a1065c2a6d62f4963c9f838d) Change-Id: Ica31723ddd621332ec4be75db0d675bc98905e43
* | | Merge "Fixes bug 767947" into stable/diabloJenkins2011-12-232-1/+30
|\ \ \
| * | | Fixes bug 767947Alvaro Lopez Garcia2011-12-213-1/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | If libvirt was restarted, a libvirt.libvirtError was raised with error domain libvirt.VIR_FROM_RPC when trying to use the existing connection. (cherry picked from commit 7c11490677bc49086271ee377e6a8076eebe15f6) Change-Id: Ib3d4ff23aadf5a0c93dde0c37c5686bf404ce9de
* | | Merge "Verify security group parameters" into stable/diabloJenkins2011-12-235-17/+140
|\ \ \
| * | | Verify security group parametersAhmad Hassan2011-12-085-17/+140
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced various sanity checks before adding security group rule into the database. The checks have been implemented both in EC2 and openstack extension code. Implemented the suggestions made in first patch by Brian Fixed the unit tests in security groups Fixed pep8 issues in security group unit tests Fixes bug 869979. (cherry picked from commit 1a12349c056b52b488591abb1671ad94a6db6526) Change-Id: I2ac28666e90e7bdeacb7b1c2676c0719cfb9e441
* | | Merge "fix rebuild sha1 not string error" into stable/diabloJenkins2011-12-212-3/+9
|\ \ \
| * | | fix rebuild sha1 not string errorDavid Subiros2011-12-082-3/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug #889164 The sha1() parameter is converted to a string before calling the funcion. (cherry picked from commit 17ae2d2662ca9af6eee0cf96fe48d3951593dc6b) Change-Id: I9cb6ff43c106c214e027d3bdacb795b4b0269f94
* | | Merge "Fixes bug 871877" into stable/diabloJenkins2011-12-213-0/+16
|\ \ \
| * | | Fixes bug 871877Alvaro Lopez2011-12-083-0/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Added an aditional testunit to the VlanNetworkTestCase to check if the FixedIpNotFoundForNetwork exception is raised properly. (cherry picked from commit 6e7b0387e417e4ef36b8ce1e0b7a7db32732838d) Change-Id: I92a0ca22aadcfa9a7fd434375e239be8ccf4f387
* | | Merge "Fixes LP878319" into stable/diabloJenkins2011-12-215-5/+42
|\ \ \
| * | | Fixes LP878319Jason Kölker2011-12-085-5/+42
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | * Adds lookup of host version in XenAPI session * Add call to determine function name of resize (cherry picked from commit bee61b32420a2b8ce982406cd6c9647098bdf70b) Change-Id: I797ff2ea34a3b3fde1091efba803a4572aaf1ede
* | | Merge "removed logic of throwing exception if no floating ip" into stable/diabloJenkins2011-12-213-18/+8
|\ \ \
| * | | removed logic of throwing exception if no floating ipJesse Andrews2011-12-083-18/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | fixes 897089 (cherry picked from commit 8230533824fd170498e51b43dd2f20e6af410c53) Change-Id: Iaa03c7b75abf67c78b4605c29ef1770c96c6a199
* | | Merge changes I7584b527,I37aef065 into stable/diabloJenkins2011-12-214-25/+79
|\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Move failed instances to error state Update exception.wrap_exception so that all exceptions (not just Error and NovaException types) get logged correctly.
| * | | Move failed instances to error stateAaron Lee2011-12-082-14/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On instance creation there is the possibility of an instance raising. This would not cause the instance to be moved to the error state. This patch fixes that. lp885323 update 1: fixing exception handling update 2: preserving the individual messages update 3: rebase on master & fix spacing (cherry picked from commit c04b431cd63f4d934f40dd1f62a9107ae6dfde90) Change-Id: I7584b527e408c08014f1b6a8abda343f1e2aa3b8
| * | | Update exception.wrap_exception so that all exceptions (not just ErrorDan Prince2011-12-082-11/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | and NovaException types) get logged correctly. (cherry picked from commit 19b3b7a0c50dd6a68238daf8827519fd83a395cc) Change-Id: I37aef06551a5ea4e29960bd80aeb0415d945fe95
* | | Fixes bug 888649Ollie Leahy2011-12-163-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change exception.VolumeIsBusy to derive from NovaException instead of Error, so that an 'unexpected keyword' exception is not thrown when the exception is raised with keyword parameters. Add unit test to confirm that the 'unexpected keyword' exception is not thrown when the exception is raised by nova.volume.driver.VolumeDriver Responded to reviewer observations, fix pep8 errors in tset_volume.py, added email address to Authors file. (cherry picked from commit e0ef89f091a77a25fa9bcfd466159e101cb42c56) Change-Id: I15464cb0cf72a2c71f430e4c8c5c2b27cd4e2ef9
* | | Merge "Fix a minor memory leak" into stable/diabloJenkins2011-12-141-0/+2
|\ \ \
View Lorry Controller Status