summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Remove unused compute_service from images controllerMark McLoughlin2012-02-101-3/+1
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems to be unused since v1.0 was removed; it used to be needed for snapshot support. Change-Id: I799ea4b188e396548792006e5a40dfab96d37957
* | | | | | | | | | | | | | Merge "Optimizes ec2 keystone usage and handles errors"Jenkins2012-02-104-34/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Optimizes ec2 keystone usage and handles errorsVishvananda Ishaya2012-02-074-34/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * breaks out gen_request_id so we can return it in error msg * breaks out ec2_error so we can use it in multiple middlewares * adds new middleware (remove old after devstack change) * skips extra call to keystone for second authentication * fixes bug 922373 Change-Id: If765d149289255b0bf0e0c1b647ebb547ce5759b
* | | | | | | | | | | | | | | Merge "Remove the last of the gflags shim layer"Jenkins2012-02-1097-336/+178
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove the last of the gflags shim layerMark McLoughlin2012-02-1097-336/+178
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make FLAGS a ConfigOpts instance and fix up all the places where we expected FlagValues behaviour. Change-Id: I8f96f42e0d8d30ba6b362d29861e717cf0fa9e89
* | | | | | | | | | | | | | | Merge "Fix disk_config typo"Jenkins2012-02-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix disk_config typoMark McLoughlin2012-02-101-1/+1
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rezise vs resize Obviously we're lacking some unit test coverage here. Change-Id: I06fab62eb16fd9aa344606a5f8b8237acec3cf31
* | | | | | | | | | | | | | Merge "Extend glance retries to show() as well"Jenkins2012-02-102-13/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Extend glance retries to show() as wellJohannes Erdfelt2012-02-102-13/+27
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 930245 nova/image/glance.py would already retry get() requests if there was a connection error, but didn't do so for show() requests. Change-Id: Ifb1a17da18b7e10ddaaec46e124efcc963681c80
* | | | | | | | | | | | | | Merge "Fix status transition when reverting resize"Jenkins2012-02-105-3/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix status transition when reverting resizeBrian Waldon2012-02-035-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Present the instance being reverted with a 'REVERT_RESIZE' status instead of 'ACTIVE' after a revertResize action is triggered. Fixes bug 924371 Change-Id: I12e98733fd00c0794fb9a4acb0cc6752ca02e855
* | | | | | | | | | | | | | Merge "Pass in project_id in ext. authorizer"Jenkins2012-02-101-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Pass in project_id in ext. authorizerRick Harris2012-02-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 927966 Change-Id: I30004493c8a0269c3582e8fd88fd9ff38904cbe5
* | | | | | | | | | | | | | Disable ConfigParser interpolation (lp#930270)Mark McLoughlin2012-02-101-1/+1
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks e.g. volume_name_template=volume-%08x instance_name_template=instance-%08x and is not part of the API contract anyway. We use $opt based value interpolation. Change-Id: I7659c7a304aac4d30a79751176ecf683bd664e6f
* | | | | | | | | | | | | Merge "Backslash continuations (nova.virt)"Jenkins2012-02-1021-190/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Backslash continuations (nova.virt)Zhongyue Luo2012-02-0821-190/+168
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #925283 Backslash continuations removal for package nova.virt Change-Id: Ia47eae3b80d90cdac044e2f875d7ece8ed9ad715
* | | | | | | | | | | | | Merge "Handle --flagfile by converting to .ini style"Jenkins2012-02-107-141/+464
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Handle --flagfile by converting to .ini styleMark McLoughlin2012-02-077-141/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code to translate flagfiles into .ini config files so that we can deprecate and, eventually remove, --flagfile. By using the flagfile compat code, we no longer need to process the contents of flagfiles as CLI options and we can reduce the number of CLI options to a sane set: --verbose --logdir --logfile --use_syslog --use_stderr --connection_type --sql_connection --api_paste_config --state_path --lock_path --fake_network --fake_rabbit This, in turn, means we can remove the evil hacks which we needed in order to register CLI options after the initial parsing of the command line. Change-Id: I9e24008fa634d7c8378b253c1f7a6d2169076086
* | | | | | | | | | | | | | Merge "Fix logging in xenapi vmops"Jenkins2012-02-101-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix logging in xenapi vmopsChris Behrens2012-02-091-12/+13
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1 case of sqlalchemy Instance model being logged which is useless Fixed other cases of instance name beingg logged instead of instance uuid Change-Id: Ia0e6354905a65d3ab571d2e6ad06225e176c3c1f
* | | | | | | | | | | | | | Merge "Backslash continuations (nova.db)"Jenkins2012-02-105-36/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Backslash continuations (nova.db)Zhongyue Luo2012-02-055-36/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #925284 Didn't remove backslash continuations related to sqlalchemy queries. Change-Id: Id2248a6ade18050607db42fda42e8b276d72b845
* | | | | | | | | | | | | | Merge "Backslash continuations (misc.)"Jenkins2012-02-1028-197/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Backslash continuations (misc.)Zhongyue Luo2012-02-0828-197/+173
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #925166 This patch for packages which have few backslash continuations. Follow up patches will be for packages network, scheduler, virt, db/sqlalchemy, tests, and api/openstack. Change-Id: I4200010b47b33fa8b9115b5d379b543200f6668d
* | | | | | | | | | | | | Merge "optimize libvirt image cache usage"Jenkins2012-02-091-16/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | optimize libvirt image cache usagePádraig Brady2012-02-091-16/+13
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dealing with cow images, minimize the number of downloads, by caching both the original download and a resized derivative, with extra disk space being used for the downloaded image. This part was suggested by Vish Ishaya. When dealing with raw images, don't bother caching the resized derivative, as it's quicker to just copy the downloaded image to the instance dir and resize in place. Similarly when generating a raw image, do so directly to the instance dir. Change-Id: I1458b2c39a51d7d9f5bdfff53155431c863b8a40
* | | | | | | | | | | | | Merge "Backslash continuations (network, scheduler)"Jenkins2012-02-0915-142/+127
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Backslash continuations (network, scheduler)Zhongyue Luo2012-02-0815-142/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #925281 Backslash continuations removal for packages nova.network and nova.scheduler Change-Id: I84f886d6bc179ecf5d09e57d278bfa644d5d851d
* | | | | | | | | | | | | | Merge "Fix confirm_resize policy handling"Jenkins2012-02-092-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix confirm_resize policy handlingRick Harris2012-02-092-2/+21
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 928649 markwash: - fixed pep8 violation Change-Id: Ie1c3136256dac0e350e430ac7c69eba4cb98b158
* | | | | | | | | | | | | | Merge "Use named logger when available"Jenkins2012-02-099-33/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use named logger when availableJohannes Erdfelt2012-02-089-33/+33
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup a handful of places where named loggers are created for a particular module but aren't used consistently. Also fix a couple of log entries that aren't internationalized Change-Id: I38186d47e7f31626b3ead779707d8ee5a15f56ac
* | | | | | | | | | | | | Remove unnecessary use of LoopingCall in nova/virt/xenapi/vm_utils.pyJohannes Erdfelt2012-02-081-18/+10
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code synchronously blocks waiting on the LoopingCall to finish anyway and the use of a maximum of number of attempts ends up being awkwardly fit in. Also, remove an out-of-date comment about future use of LoopingCall Change-Id: Ife397e171f28fff5e73c70e6957cecdd09a42d68
* | | | | | | | | | | | Merge "Stop using LoopingCall in nova.virt.xenapi_conn:wait_for_task()"Jenkins2012-02-081-45/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Stop using LoopingCall in nova.virt.xenapi_conn:wait_for_task()Johannes Erdfelt2012-02-081-45/+35
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of utils.LoopingCall is unnecessary since code waits immediately for the LoopingCall to finish. This results in code that is more complicated than necessary, but also it creates an extra greenthread that ends up obfuscating stack trace in case of exceptions. Change-Id: Iaf0909a4f2307e8657e7baa15cb5a7852ba6feca
* | | | | | | | | | | | Merge "Fix deprecated warning"Jenkins2012-02-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix deprecated warningJohannes Erdfelt2012-02-081-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 929101 The message attribute of exceptions is deprecated, use unicode() instead Change-Id: I81ecd96807d6ad2ac2bcf64edf35600c705e53aa
* | | | | | | | | | | | Merge "Consistently update instance in nova/compute/manager.py"Jenkins2012-02-082-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Consistently update instance in nova/compute/manager.pyJohannes Erdfelt2012-02-082-16/+8
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code used a mix of self.db.instance_update and self._update_instance, so settle on self._update_instance. Also, the code used a mix of self._update_instance and self._set_instance_error_state, so settle on self._set_instance_error_state. This also changes the code to not clear task_state in all cases, leaving it set for debugging purposes. Change-Id: I5c841ebfb60ba4acf62382060e416ea780bd66ba
* | | | | | | | | | | | Merge "Add flag to include link local in port security"Jenkins2012-02-081-12/+20
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add flag to include link local in port securityJason Kölker2012-02-081-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes LP929090 Change-Id: I797e2e8299bc4a2cbb07fa210e7c25750b9bf8c3
* | | | | | | | | | | | Merge "Added ability to load specific extensions."Jenkins2012-02-084-6/+35
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added ability to load specific extensions.Brian Lamar2012-02-084-6/+35
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, the following nova.conf configuration file: --osapi_compute_extension=nova.api.openstack.compute.contrib.select_extensions --osapi_compute_ext_list=Createserverext,Extended_status Would load only the Createserverext and Extended_status extensions. Change-Id: I8c2a444683c6e4114875827b44ef01e457eb94ac
* | | | | | | | | | | | Merge "Require newer versions of SA and SA-Migrate"Jenkins2012-02-081-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Require newer versions of SA and SA-MigrateRick Harris2012-02-081-2/+2
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 928637 Change-Id: I27d06d945449f70a6da00c1f5d306bd5fe43b253
* | | | | | | | | | | Merge "Adding the request id to response headers. Again."Jenkins2012-02-082-2/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adding the request id to response headers. Again.Naveed Massjouni2012-02-072-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature used to exist in nova. A major refactor inadvertently removed it. Change-Id: Ie9b658bef808f3b5959b85f731483a2df59a5ede bp: nova-request-response-id
* | | | | | | | | | | | Merge "Handle service failures during finish_resize gracefully"Jenkins2012-02-081-35/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Handle service failures during finish_resize gracefullyJohannes Erdfelt2012-02-081-35/+39
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 928474 If exceptions occur in the network or image service during finish_resize(), the instance can be left in RESIZE state. This change will ensure those exceptions will move the instance to ERROR as well. Change-Id: I638db27da27310ccd55d52453c3aadaa41634040
* | | | | | | | | | | | Allow e2fsck to exit with 1Rick Harris2012-02-081-1/+6
| |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 928603 Change-Id: I431979bceb7ff5835167aceb10dfb0652b8fe310