summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Improve bw_usage_update() performanceChris Behrens2012-08-134-30/+92
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1036084 bw_usage_update() most commonly updates rows vs creates rows. New rows are only created on the 1st bandwidth update for an instance or when the audit period rolls over. This cuts down DB queries to 1 for the 'update' case. Added bonus: Remove unused 'import inspect' in compute manager. Change-Id: Ie5f6c919676046d817b842138dc9d17d1115d3c0
* / / / / / Avoid {} and [] as default argumentsYun Mao2012-08-131-2/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dict and list objects are mutable and are usually the sources of subtle bugs when used as default arguments. Avoid them. Change-Id: I5340c7051455a80c4adfab885d89acb46570fa52
* | | | | Merge "Fix type error in state comparison"Jenkins2012-08-131-1/+1
|\ \ \ \ \
| * | | | | Fix type error in state comparisonYun Mao2012-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vm_states.RESIZED is not a list/tuple, use == to compare instead of in (although it did work by accident in Python). Change-Id: Ib739e729ae79a3f68ca0eac10167982bd3a6656c
* | | | | | Merge "Move results filtering to db."Jenkins2012-08-135-80/+87
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Move results filtering to db.Alex Meade2012-08-075-80/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves exact filter and regex filter matching on the listing of instances to the database query. This is important so that we can eventually do all pagination through the database. If the db backend does not support regex matching then the SQL 'LIKE' operator will be used instead. Change-Id: If9dd644066787f0f3667992f23e5c33b1dc90286
* | | | | | Merge "Flavor extra specs extension use instance_type id"Jenkins2012-08-135-37/+51
|\ \ \ \ \ \
| * | | | | | Flavor extra specs extension use instance_type idYunhong, Jiang2012-08-065-37/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 1031263 The nova database API use instance_type id as parameter to access flavor extra spec. However, the flavor extra_specs API extension use flavor_id as parameter wrongly. As the instance_type ID is a purely nova internal ID, the database should not expose it and instead use flavor_id as the parameter Change-Id: I5f509cb7c4457d8c399df32f559a874d498be762 Signed-off-by: Yunhong, Jiang <yunhong.jiang@intel.com>
* | | | | | | Merge "xenapi: ensure all calls to agent get logged"Jenkins2012-08-132-11/+14
|\ \ \ \ \ \ \
| * | | | | | | xenapi: ensure all calls to agent get loggedJohannes Erdfelt2012-08-092-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, a call to an agent wouldn't get logged since the caller was expected to log and not all did this. Move this to the callee so the caller doesn't need to do anything extra. Change-Id: Ie16a372187c9215028475522eef53bca9a5cf4d8
* | | | | | | | Key auto_disk_config in create server off of ext.Vishvananda Ishaya2012-08-122-1/+29
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements part of blueprint disable-server-extensions Makes sure that auto_disk_config is only accepted in the create server request if the extension is enabled. Note that the extension alias is OS-DCF because it also adds output to the server request. Change-Id: I59fafe769e1e562e6bf9f6db768acc9b0f8d2b93
* | | | | | | Merge "Compute restart causes period of network 'blackout'"Jenkins2012-08-127-32/+117
|\ \ \ \ \ \ \
| * | | | | | | Compute restart causes period of network 'blackout'David McNally2012-08-107-32/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1034401 When a compute service is restarted each instance running on the host has its iptables rules built and applied sequentially during the host init stage. The impact of this, especially on a host running many instances, can be observed as a period where some instances are not accessible as the existing iptables rules have been torn down and not yet re-applied. The presented work-around for this is a configurable/flagged deferred mode that prevents the application of the iptables rules until all instances on the host had been initialised then the rules for all instances are applied all at once preventing a 'blackout' period. Change-Id: I0da90d07e54225fb63f3884897fb00a6027cd537
* | | | | | | | Merge "remove nova code related to Quantum v1 API"Jenkins2012-08-1216-2838/+105
|\ \ \ \ \ \ \ \
| * | | | | | | | remove nova code related to Quantum v1 APIDan Wendlandt2012-08-1016-2838/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 1034692 Quantum team is removing all v1 support in Folsom, so this code will not be used or supported with Quantum Folsom release. Change-Id: I4c397d5238fcc3a15320e052bdc4735dfec1f176
* | | | | | | | | Merge "Default behavior should restrict admins to tenant for volumes."Jenkins2012-08-127-20/+165
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Default behavior should restrict admins to tenant for volumes.jakedahn2012-08-107-20/+165
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * NOTE: This is a port from cinder to nova volumes * Now to view all volumes or volume snapshots across all tenants you need to include the all_tenants=1 GET param in your api request. * Fixes remaining issues blocking bug #967882 Change-Id: I7fe15e792b62e59973c7faa2cf1c52929ae5864f
* | | | | | | | | Merge "Revert "Remove unused add_network_to_project() method""Jenkins2012-08-126-5/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Remove unused add_network_to_project() method"Alessio Ababilov2012-08-106-5/+33
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d8e39cb775a872c46d067bee8febc40dee799369. Change-Id: I22f0692814ff029b4960ab32cbee63bbf4922106
* | | | | | | | | Merge "Sync with latest version of openstack.common.cfg"Jenkins2012-08-122-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sync with latest version of openstack.common.cfgMark McLoughlin2012-08-102-2/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes since last sync: - Modifies _is_opt_registered fcn to check for duplicate opts - allow empty config values Change-Id: I5150404a0ff97f37d1d1f1b778736fa385d33860
* | | | | | | | | Merge "Sync some cleanups from openstack.common"Jenkins2012-08-124-8/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Sync some cleanups from openstack.commonMark McLoughlin2012-08-104-8/+7
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to openstack.common.notifier: - fix bug lp:1019348,update openstack-common to support pep8 1.3. Changes to openstack.common.setup: - Fix errors reported by pyflakes Changes to openstack.common.timeutils: - Remove unused imports Change-Id: Iac46d11a996857c84e06a8dbd3ecfcd774142ef8
* | | | | | | | | Merge "Key requested_networks off of network extension"Jenkins2012-08-112-2/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Key requested_networks off of network extensionNachi Ueno2012-08-102-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partially implements blueprint disable-server-extensions Change-Id: Id6abe827b0d0bbf04dc25bed9a92296b24f34f5f
* | | | | | | | | | Merge "Config drive v2"Jenkins2012-08-117-48/+396
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Config drive v2Michael Still2012-08-117-48/+396
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first cut of config drive v2. Some points to note: - implements a helper to create new-style config drives. These config drives can be VFAT or ISO9660, this is controlled by a flag. The current default is ISO9660. - the config drives contain all the injected files, as well as everything returned from the ec2 style metadata service. Only the most recent version of the ec2 metadata is used, but future versions will appear as well. - the v1 functionality of specifying an image from glance to have the files injected into is dropped. - the location for file injection is now a directory named openstack/files, not the root level of the filesystem. Filename mapping is in the openstack metadata files. - the default format for the config drive is iso9660, although the previous vfat is available with a flag change. - includes the first version of an openstack metadata format. - there are some simple unit tests which probably need more done to them. Partially implements bp config-drive-v2. Change-Id: I210fa4dd7d8d6be398a46b30a0d46b960e22d6b0
* | | | | | | | | Merge " Key config_drive off of config-drive extension"Jenkins2012-08-102-1/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Key config_drive off of config-drive extensionNachi Ueno2012-08-102-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partially implements blueprint disable-server-extensions Change-Id: I42743efeb74b3286c158589eb6af7b1d9ba215d5
* | | | | | | | | | Merge changes I87ce041c,Iaca00958,I326b26c4Jenkins2012-08-105-6/+169
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Don't accept key_name if not enabled Key min_count, max_count, ret_res_id off of ext. Key availability_zone in create server off of ext.
| * | | | | | | | | | Don't accept key_name if not enabledSean Dague2012-08-102-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partially implements blueprint disable-server-extensions moves filling out key_name variable behind conditional only used when os-keypairs is enabled. Adds unit tests to ensure this behaves as expected (Remove debugging that was left in) Change-Id: I87ce041c2093c93a1a2456ef51357593e9de0681
| * | | | | | | | | | Key min_count, max_count, ret_res_id off of ext.Vishvananda Ishaya2012-08-094-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements part of blueprint disable-server-extensions Adds a new extension descriptor callsed os-multiple-create. Modifies the min_count, max_count, and return_reservation_id parameters to server create to only be allowed if the extension is enabled. Change-Id: Iaca009588d6c824e0852a060787d2a4cb9614278
| * | | | | | | | | | Key availability_zone in create server off of ext.Vishvananda Ishaya2012-08-094-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements part of blueprint disable-server-extensions Adds a new extension descriptor for availability_zone and makes sure that availability_zone is only accepted in the create server request if the extension is enabled. Change-Id: I326b26c4741ffa6a8b594be26d0cd22d032a6162
* | | | | | | | | | | Merge "import module, not type."Jenkins2012-08-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | import module, not type.Russell Bryant2012-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a little HACKING issue. Import the collections module instead of the defaultdict type from collections. Change-Id: I59c6fe947b6ed03f13c3481b0484896e8daaa963
* | | | | | | | | | | | Merge "Make sure reservations is initialized"Jenkins2012-08-101-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make sure reservations is initializedKevin L. Mitchell2012-08-101-4/+3
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In compute API, _delete() could reference reservations before it was ever assigned, if the call to _update() or to QUOTAS.reserve() raised an exception--the exception handlers test to see if reservations is set, and if so, rolls the reservations back. This patch makes sure the reservations variable is initialized to None before entering the try: block. Change-Id: I7e344074d8fd75b371d78abf8fd15b6f84023cef
* | | | | | | | | | | | Merge "maint: remove an unused import in libvirt.driver"Jenkins2012-08-103-8/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | maint: remove an unused import in libvirt.driverPádraig Brady2012-08-043-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This import was recently reintroduced, due to confusing pylint output. Therefore remove it again and adjust things so pylint won't warn in future. Change-Id: I25f293f171c651c25d27e8d55c9240fd808590ba
* | | | | | | | | | | | | Merge "Don't accept scheduler_hints if not enabled"Jenkins2012-08-102-1/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Don't accept scheduler_hints if not enabledSean Dague2012-08-092-1/+29
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partially implements blueprint disable-server-extensions moves the filling out of the code behind a conditional to ensure this data is only passed if the extension is actually enabled Change-Id: If866eb87c9e6189b6948cb37f0cb8f5e26c8cced
* | | | | | | | | | | | | Merge changes I7aef0ebe,I0dd233c2Jenkins2012-08-105-27/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Key user_data in create server off of extension Key block_device_mapping off of volume extension
| * | | | | | | | | | | | Key user_data in create server off of extensionVishvananda Ishaya2012-08-094-1/+56
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements part of blueprint disable-server-extensions Adds a new extension descriptor for user_data and makes sure that user_data is only accepted in the create server request if the extension is enabled. Change-Id: I7aef0ebe569da841adbf380d5695c9029fb3b002
| * | | | | | | | | | | Key block_device_mapping off of volume extensionVishvananda Ishaya2012-08-093-26/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partially implements blueprint disable-server-extensions Instead of creating a child controller for boot from volume, key the post parameter of of the os-volumes extension. Change-Id: I0dd233c2ae12a09d6fc59c49042c2f8b83f3fdba
* | | | | | | | | | | | Merge "Make sure ec2 mapping raises proper exceptions"Jenkins2012-08-103-10/+25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make sure ec2 mapping raises proper exceptionsVishvananda Ishaya2012-08-103-10/+25
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The get commands in the db layer were constructing InstanceNotFound, VolumeNotFound, and SnapshotNotFound with imporoper kwargs. This fixes them to raise properly and adds a test to verify that the exception formatting succeeded. Fixes bug 1035375 Change-Id: I05a5bb57c047ca2b2f086c70ad12a640f51b2d3a
* | | | | | | | | | | | Merge "General host aggregates part 2"Jenkins2012-08-1012-37/+267
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | General host aggregates part 2Joe Gordon2012-08-0712-37/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially implements blueprint general-host-aggregates: Scheduler Filter * Add AggregateInstanceExtraSpecsFilter * change db.aggregate_get_by_host to return a list of aggregates instead of the first aggregate * Add optional key filter to db.aggregate_get_by_host along with test * Add db.aggregate_metadata_get_by_host to get host aggregate metadata * add optional key filter to db.aggregate_metadata_get_by_host * Add AggregateTypeAffinityFilter Change-Id: I4a3061276cc3b0c5c695eaf973b773183b3c4f4b
* | | | | | | | | | | Merge "Making security group refresh more specific"Jenkins2012-08-1010-19/+196
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Making security group refresh more specificDavid McNally2012-08-1010-19/+196
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1029495 The trigger_members_refresh method in compute.api.py specifies a group id in the call to refresh_security_group_members. This is just the last group id seen and ignores the fact that a refresh may impact members of multiple groups. This is masked by the fact that on the host the group id is ignored and all instances have their security rules refreshed regardless of if they are part of the changed group or not. This change modifies the logic surrounding refreshes so we send a refresh request for each instance which is affected by a security group change, this ensures we aren't spending time refreshing unaffected instances and also removes the possibility of refreshing an instance multiple times if it is a member of more than one group. Also changed to be instance-centric is the refresh carried out when a rule is added/removed to a security group. Change-Id: Iec98e9aed818fdc4ecc88c8dcdd4ee5fa9386e00