summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Initialize progress to 0 for build and resize.Rick Harris2012-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 942956 Change-Id: I65031bcd61b49bcae9bd886d7a9f070cba5caad0
* | | | | | | | | | | | | Merge "Perform image show early in the resize process"Jenkins2012-02-293-28/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Perform image show early in the resize processMark Washenberger2012-02-293-28/+34
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change addresses bug 943421 by performing glance interactions much earlier in the resize process. This prevents token expiration from breaking resizes. - added a comment to the compute api change to give some context and help prevent regression on this bug Change-Id: I21619f9f6189d5bdec64de47988985cbc3b8016d
* | | | | | | | | | | | Merge "Add lun number to provider_location in create_volume * Fixes bug 938876"Jenkins2012-02-291-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add lun number to provider_location in create_volumejohn-griffith2012-02-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes bug 938876 Change-Id: I22ccda1df7a0b718697588b0a808af5c58181ed8
* | | | | | | | | | | | | Include hypervisor_hostname in the extended server attributes.Josh Kearney2012-02-291-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5424ee3defea76ac4cdbfcf6fe8675aad8e66c7a
* | | | | | | | | | | | | Merge "Provide retry-after guidance on throttled requests"Jenkins2012-02-292-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Provide retry-after guidance on throttled requestsEoghan Glynn2012-02-282-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 942874 Guide the caller's redrive strategy with a Retry-After hint in the 413 response emitted when rate limits are exceeded. The simplest format of Retry-After is used, i.e. number of seconds as opposed to a HTTP time string. Change-Id: I8b1a28f964a111008b1a88d9c0f96c5a0abd8314
* | | | | | | | | | | | | Merge "Include launch_index when creating instances."Jenkins2012-02-298-6/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Include launch_index when creating instances.Mike Milner2012-02-238-6/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 934534. The launch_index column in the database is used as the ami-launch-index value provided by the metadata service. If launch_index is not specified it defaults to 1. This is incorrect for the single instance case (should be 0) and doesn't correctly handle multi-instance starts. This branch changes the default launch_index to 0 (to handle the single instance case) and adds the launch_index in the schedulers for multi-instance starts. Change-Id: Ifc45abf4cd9f50f732ba4a4b68c0a6242a6c9710
* | | | | | | | | | | | | Return empty list when volume not attachedBrian Waldon2012-02-283-22/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The api used to return a list of a single empty dict * Fixes bug 942990 Change-Id: I9926515acfcedf711e81615aa13cec0bbf968086
* | | | | | | | | | | | | Merge "Cast volume-related ids to str"Jenkins2012-02-297-30/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Cast volume-related ids to strBrian Waldon2012-02-287-30/+40
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This is preparing the interface for uuids * Fixes bug 943006 Change-Id: I7d27506118a830ae7257755032354ae7411567d3
* | | | | | | | | | | | | Merge "Fix for bug 942896: Make sure network['host'] is set"Jenkins2012-02-292-3/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix for bug 942896: Make sure network['host'] is setBrad Hall2012-02-282-3/+33
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The floating ip mixin requires network['host'] to be set. We now set it during create_network and also update it at startup time to make sure it is set. Change-Id: Ide0fe265d08a2ef322d9f7b6bfed5ba8b510c246
* / | | | | | | | | | | Allow xvd* to be supplied for volume in xenapiBrian Waldon2012-02-282-2/+24
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes bug 942880 Change-Id: I7d0817051b837e3ba17f4edd8c47fd2c730c9822
* | | | | | | | | | | Fix issue starting nova-compute w/ XenServerBrian Lamar2012-02-281-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a fresh-install environment, nova-compute will fail to start due to missing record in compute_nodes table. I have moved the db update to be included in the update_available_resources function. Fixes bug 942893 Change-Id: I4b4f6a493ef0bbe81224c7408d0985e14fa9f1bc
* | | | | | | | | | | Merge "Make scheduler filters more pluggable"Jenkins2012-02-2814-135/+194
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make scheduler filters more pluggableChris Behrens2012-02-2714-135/+194
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filters are supposed to be pluggable, but they are not, since you have to modify __init__.py. This adds a --scheduler_availabile_filters setting which replaces the hardcoding in __init__.py. This setting is a MultiStr (a list, which you can specify more than once) containing the full paths to filter classes to make available to the scheduler. Using a value of 'nova.scheduler.filters.standard_filters' maps to all standard filters included in nova under nova.scheduler.filters. This is the default setting and matches what was in __init__.py before. Also renamed --default_host_filters to --scheduler_default_filters to make the flag a bit more clear. Change-Id: I10eb54e9982b6d42316adfb2cc2600b44a9c3bdf
* | | | | | | | | | | Merge "Fixes bug 942549"Jenkins2012-02-282-1/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes bug 942549John Garbutt2012-02-282-1/+13
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure a more meaninful error is reported when an aggregate is created in a non-exsistent availability zone. Change-Id: I15ea6c884bb6f326df1d88019ee0ecf070196d1e
* | | | | | | | | | | Use constant time string comparisons for auth.Russell Bryant2012-02-284-4/+29
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 942644. Use constant time string comparisons when doing authentication to help guard against timing attacks. Change-Id: Iaaefb13f7618b06834630d9ccb97aff056b4bf4c
* | | | | | | | | | Merge "Rename zones table to cells and Instance.zone_name to cell_name"Jenkins2012-02-285-43/+78
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename zones table to cells and Instance.zone_name to cell_nameChris Behrens2012-02-285-43/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vish made an executive decision to use the term 'Cell' to refer to the former 'Zone'. :) This fixes up the core code required for the future Cells branch. Change-Id: Iff0fb01f0c2862a646bfb2d3fd4e218f1d2b7a93
* | | | | | | | | | | Merge "Ensure temporary file gets cleaned up after test"Jenkins2012-02-281-13/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ensure temporary file gets cleaned up after testJohannes Erdfelt2012-02-281-13/+17
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia70dcddedd9bffcf55c266f93052fe37aca98260
* | | | | | | | | | | Merge "OS X Support fixed, bug 942352"Jenkins2012-02-282-3/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | OS X Support fixed, bug 942352Joe Gordon2012-02-272-3/+6
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3aa28ba46b0418310637dfeacbdea60361a7a280
* | | | | | | | | | Merge "Add NoopFirewallDriver"Jenkins2012-02-282-0/+13
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add NoopFirewallDriverChris Behrens2012-02-282-0/+13
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible that the firewall is managed by an external network service, therefore we need a firewall driver which does nothing. Change-Id: Icfda92534421fa908b398acd8a811c01d4bc3dbd
* | | | | | | | | Merge "Do not hit the network_api every poll"Jenkins2012-02-286-18/+77
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not hit the network_api every pollJason Kölker2012-02-276-18/+77
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Store only the mac address in the bw cache * Gather bw records by the list of macs from an instance * Fixed LP940069 Change-Id: I58ccb314d1fcd218ddd0bbd7857223e6435952fb
* | | | | | | | | Merge "Call detach_volume when attach fails"Jenkins2012-02-282-1/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Call detach_volume when attach failsBrian Waldon2012-02-272-1/+16
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes bug 914974 * Raise exception.DeviceBusy when volume cannot attach Change-Id: Ie18377ba6acd6226612c70fa209185cc579c2d85
* | | | | | | | | Use assertDictMatch to keep 2.6 unit tests passingMark Washenberger2012-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5cdcbeec8bd36250e6d6dff34b2bbbd12f10d280
* | | | | | | | | Merge "Handle case where instance['info_cache'] is None"Jenkins2012-02-282-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Handle case where instance['info_cache'] is NoneChris Behrens2012-02-282-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 942443 Change-Id: I77c3495d1de0a9b73acc576dd0638b430a4ce16e
* | | | | | | | | | Merge "TypeError API exceptions get logged incorrectly"Jenkins2012-02-281-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | TypeError API exceptions get logged incorrectlyChris Behrens2012-02-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 942431 LOG.exception() always logs sys.exc_info() which does not always represent the real exception we want to log. This changes the wsgi ResourceExceptionHandler context manager to LOG.error() the traeback info that's passed to __exit__() Change-Id: I0c3728a9ee740597feb828a513aea76e7849efc6
* | | | | | | | | | Merge "Fixes cloudpipe extension to work with keystone"Jenkins2012-02-2810-273/+151
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fixes cloudpipe extension to work with keystoneVishvananda Ishaya2012-02-2610-273/+151
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removes deprecated auth from cloudpipe extension * Fixes pipelib to not use ec2_api * Changes vpn_image_id to be a uuid * Uses network api to retrieve information * Simplifies cloudpipe tests * Removes nova-manage cloudpipe launching * Removes related unused db methods * Fixes bug 940744 Change-Id: I5fd1fb49a9e11b89062aa754501fed29874cb6ee
* | | | | | | | | Merge "Add utils.tempdir() context manager for easy temp dirs"Jenkins2012-02-2810-326/+261
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add utils.tempdir() context manager for easy temp dirsJohannes Erdfelt2012-02-2810-326/+261
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 883323 (and others) Users of tempfile.mkdtemp() need to make sure the directory is cleaned up when it's done being used. Unfortunately, not all of the code does so at all, or safely (by using a try/finally block). Change-Id: I270109d83efec4f8b3dd954021493f4d96c6ab79
* / | | | | | | Remove monkey patching in carrot RPC driverJohannes Erdfelt2012-02-281-3/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's already handled more appropriately by nova/testing/runner.py and by the individual executables in bin Change-Id: I8a0dcc699a859ce78575b0c3d2b9dc8faea0b847
* | | | | | | Merge "Adds temporary chown to sparse_copy."Jenkins2012-02-272-19/+44
|\ \ \ \ \ \ \
| * | | | | | | Adds temporary chown to sparse_copy.Rick Harris2012-02-272-19/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `sparse_copy` needs read and write access to the devices. Since we cannot shell out to a run-as-root command here, we temporarily take ownership of the device. Change-Id: I891c38dbcba7177286dca729684c88ac065bd085
* | | | | | | | make nova-network usable with Python < 2.6.5Christian Berendt2012-02-271-7/+12
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is in issue in Python < 2.6.5 with using unicode strings as keyword arguemnts. see http://bugs.python.org/issue4978 for details. because several not-yet-outdated enterprise distributions are using Python < 2.6.5 the unicode strings in the keys of the dictionaries in used as keyword arguments nova/network/model.py should be converted. fixes bug 940941 Change-Id: Ib1d9955677e228fce6cc8e17fddc780d1a839d84
* | | | | | | Merge "Re-adds ssl to kombu configuration and adds flags that are needed to ↵Jenkins2012-02-273-1/+103
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pass through to kombu."
| * | | | | | | Re-adds ssl to kombu configuration and adds flags that are needed to pass ↵Joshua Harlow2012-02-273-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through to kombu. Implements part of blueprint ssl-endpoints Adds in configuration options: kombu_ssl_version (ssl version) kombu_ssl_keyfile (ssl keyfile) kombu_ssl_certfile (ssl certfile) kombu_ssl_ca_certs (ssl ca certfile) This adds onto rabbit_use_ssl (which must be True for the above to have any effect) and allows users to specify in greater detail (more than just True/False) how SSL is going to be configured. Change-Id: I2186a6aa9397df857321324bf4007bc8310b85ce
* | | | | | | | Merge "Fix bug 900864 Quantum Manager flag for IP injection."Jenkins2012-02-271-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |