summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Fix the conf argument to get_connection_pool().Doug Hellmann2012-05-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first argument to amqp.get_connection_pool() should be a global config object, not the Connection. Change-Id: Ic0b8f32ea42bdebdd883175a1351b3a52f26942d
* | | | | | | | Merge "Make xenapi fake match real xenapi a bit closer"Jenkins2012-05-302-5/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Make xenapi fake match real xenapi a bit closerJohannes Erdfelt2012-05-302-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xenstore_data is a dictionary in the real xenapi and keys get deleted from xenstore_data and other_config when removing them instead of being set to None. Change-Id: I462b04b6e1dc5ad4abf05cc50538121811c2334e
* | | | | | | | | Merge "Align ApiEc2TestCase to closer match api-paste.ini"Jenkins2012-05-301-4/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Align ApiEc2TestCase to closer match api-paste.iniJoe Gordon2012-05-301-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I02f5d6bc66fd372132d4d01e2027c1d3d8467b91
* | | | | | | | | | Merge "Add attach_time for EC2 Volumes"Jenkins2012-05-303-1/+74
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Add attach_time for EC2 VolumesChuck Short2012-05-303-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the EC2 API spec, attach_time has a timestamp that is returned when running euca-describe-volumes. Openstack EC2 API currently does not do this. This fixes bug 1001828 Change-Id: I571b937481f22e8d0f4eb38d4cabcafc5fbb920b Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | | Merge "New RPC tests, docstring fixes."Jenkins2012-05-302-26/+78
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | New RPC tests, docstring fixes.Eric Windisch2012-05-302-26/+78
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes versioning problem in impl_fake Makes topics configurable by RPC test suites. Change-Id: I2c7b2413b8e642e7ac1e82d54c052b97d6149659
* | | | | | | | | | Merge changes I17ca4b69,I9e6ec0d2Jenkins2012-05-304-11/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Remove nova.log usage from nova.rpc. Remove nova.context dependency from nova.rpc
| * | | | | | | | | | Remove nova.log usage from nova.rpc.Russell Bryant2012-05-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of blueprint common-rpc. This patch removes the usage of nova.log from nova.rpc. This is necessary before nova.rpc can be moved to openstack-common. The rpc logging was not using any of the extra features provided in nova.log as far as I can tell, so the changes are very simple. This is the final dependency. After this change, the rpc code can be moved to openstack-common without any changes. Change-Id: I17ca4b691bb8d4f18e618632a2381dd12d31852a
| * | | | | | | | | | Remove nova.context dependency from nova.rpcRussell Bryant2012-05-263-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of blueprint common-rpc. This patch removes the usage of nova.context from nova.rpc. Everything needed to implement RpcContext now exists within nova.rpc. Change-Id: I9e6ec0d22e55d3d4f38e12e0fdd2df745da496f5
* | | | | | | | | | | Merge "Localize rpc options to rpc code."Jenkins2012-05-303-38/+39
|\| | | | | | | | | |
| * | | | | | | | | | Localize rpc options to rpc code.Russell Bryant2012-05-253-38/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of blueprint common-rpc. Move rpc options from nova.flags into nova.rpc code. This is necessary before the rpc code can be moved to openstack-common. Change-Id: I474c3660e1cbd3ab663571b1e088c84deb905e0b
* | | | | | | | | | | Merge "Grammar fixes."Jenkins2012-05-3014-24/+25
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Grammar fixes.Matt Joyce2012-05-2914-24/+25
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff3f5765193e0bc98dfc377ee5a9b6f47ae11859
* | | | | | | | | | Merge "Fix reservation_commit so it works w/ PostgreSQL."Jenkins2012-05-301-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix reservation_commit so it works w/ PostgreSQL.Dan Prince2012-05-301-0/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Reservation model so that the 'usage' relationship is explicitly forced to use an inner join. This fixes an issue on PostgreSQL which doesn't support 'SELECT FOR UPDATE' on outer joined queries. Fixes LP Bug #1003756. Change-Id: I3c40bd8481855a18391e12d7411762e91b1ef8b0
* | | | | | | | | Merge "fixes bug 1004153"Jenkins2012-05-302-3/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | fixes bug 1004153Yun Mao2012-05-242-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes save_and_reraise_exception call to the right module and removes unused import. Change-Id: I3e6472fe5ade0cc0c155b73b97c8aabbf9b21398
* | | | | | | | | Merge "Remove Deprecated auth from EC2"Jenkins2012-05-302-129/+0
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Remove Deprecated auth from EC2Joe Gordon2012-05-292-129/+0
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially implements bp remove-deprecated-auth Change-Id: Ic500f8b2eb68d6b56fa8c6a7313c550e7b293d5d
* / | | | | | | remove dead file nova/tests/db/nova.austin.sqliteYun Mao2012-05-302-1/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file no longer appears to be used. Change-Id: I6cee63f3e35ed1de68249aa12e828e23cbe65a40
* | | / / / / Grammar / spelling correctionsMatt Joyce2012-05-2911-20/+21
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Change-Id: Id5b6665a2a40a9bd0830c1a3500b4ad98eec435b
* | | | | | Merge "Allow adding fixed IPs by network UUID"Jenkins2012-05-292-3/+39
|\ \ \ \ \ \
| * | | | | | Allow adding fixed IPs by network UUIDMohammed Naser2012-05-252-3/+39
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes LP Bug #1004280 Change-Id: I832b21091803d8da511ded96d14000602016e984
* | | | | | Merge "update xen to use network_model"Jenkins2012-05-2920-328/+401
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | update xen to use network_modelTrey Morris2012-05-2420-328/+401
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blueprint xenapi-network-info-model updated xenapi to use the new network info models also: updated virt firewall to handle both old version and new hotness made a few minor changes to the network info model moved the legacy converstion shim from compute/utils to the model itself wharrgarbl'd a few of the tests NOTE: no unittests were skipped during the creation of this patch Change-Id: Ib77dd2bf4f0a525b73800441f19013e842c77f98
* | | | | Merge "_s3_create update only pertinent metadata"Jenkins2012-05-285-26/+105
|\ \ \ \ \
| * | | | | _s3_create update only pertinent metadataJohn Tran2012-05-255-26/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 827458. nova/image/s3.py _s3_create iterates through each image_state during image creation isn't mindful of metadata updates such as 'is_public'. Now will only update the specific pertinent metadata instead of purging all. Change-Id: I3e678d028464ac252383aa363baf488249dca198
* | | | | | Merge "clean-up of the bare-metal framework."Jenkins2012-05-273-42/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | clean-up of the bare-metal framework.Armando Migliaccio2012-05-253-42/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | address minor problems and errors found in the driver, such as old docstrings, unused imports, and variables, references of non-existent classes, and methods; plus remove the requirement that every sub-driver needs to be implemented as singleton, as the tilera one. Change-Id: I5943bcdd785c1b4b83e95f88bd7d69c1edc5f62f
* | | | | | Fix a minor spelling error.Russell Bryant2012-05-251-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | Change-Id: I6fe9f254814be6c28bc9377b864c8c4c454390ff
* | | | | Merge "Bugfix in simple_tenant_usage API detail view"Jenkins2012-05-252-5/+20
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Bugfix in simple_tenant_usage API detail viewZhongyue Luo2012-05-252-5/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | Fixes bug #1002154 Change-Id: I56b38c32e55c825297626eb0d6813d70fbefad4c
* | | | Merge "Fix XenServer diagnostics to provide correct details"Jenkins2012-05-252-10/+27
|\ \ \ \
| * | | | Fix XenServer diagnostics to provide correct detailsMohammed Naser2012-05-222-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XenServer driver was providing the values which were not the actual latest information, this makes sure the information is the latest and fixes LP Bug #1002497 Change-Id: I4241be4a040fbadd630ba3c2cfaacbcf1c18f72e
* | | | | Merge "Use utils.utcnow rather than datetime.utcnow"Jenkins2012-05-2512-34/+35
|\ \ \ \ \
| * | | | | Use utils.utcnow rather than datetime.utcnowZhongyue Luo2012-05-2512-34/+35
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1003587 Edit direct use of datetime.utcnow or datetime.now to utilize utils.utcnow Change-Id: I1130f6e664f252fc5da7304f495dc9f980721224
* | | | | Merge "Expose a limited networks API for users"Jenkins2012-05-255-21/+65
|\ \ \ \ \
| * | | | | Expose a limited networks API for usersMohammed Naser2012-05-245-21/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, users do not have any way of knowing what networks are available for use, and in some scenarios such as when a user wants to add a fixed IP, they do not have access to the network ID. This exposes a limited amount of information through the existing networks extension for users and fixes LP Bug #1003979 Change-Id: I14cc3a377ee0f031b4edaf7eeec3a6550a402b1a
* | | | | | Merge "Use cfg's new behavior of reset() clearing overrides"Jenkins2012-05-254-34/+30
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use cfg's new behavior of reset() clearing overridesMark McLoughlin2012-05-214-34/+30
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia363ab3c3c16d4988c2e7f3a73302134698a9b79
* | | | | | Merge "removed a dead db function register_models()"Jenkins2012-05-251-48/+0
|\ \ \ \ \ \
| * | | | | | removed a dead db function register_models()Yun Mao2012-05-241-48/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual models are created by the migration modules. register_models() are no longer used and raises some confusions. Change-Id: Id418917f3bbcf9a951b89bec01499a53cc92f57b
* / | | | | add queue name argument to TopicConsumerDoug Hellmann2012-05-246-16/+124
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceilometer is going to want to subscribe several worker processes to the notifications.info topic queue. The pool of workers needs to be assured of receiving all messages, without interference from other clients listening for notifications. The TopicConsumer class always assumes the topic and queue name should be the same, but in the ceilometer case we want to use a separate named queue with a different name. The only parameter that cannot be controlled by the user of TopicConsumer is the queue name, so this change adds the ability to set the queue name. Change-Id: I41a525de2fd855ca30c24fafcfbfefd6ab615dd7
* | | | | Merge "Remove deprecated quota code."Jenkins2012-05-242-639/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove deprecated quota code.Kevin L. Mitchell2012-05-242-639/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This completes blueprint quota-refactor by removing the now-unused classic quotas code. This change is fairly substantial. To make it easier to review, it has been broken up into 3 parts. This is the third part. Change-Id: I8856f84655ef2e6d61b3d1f52190b83a96c87fdb
* | | | | Merge "Use memcache to store consoleauth tokens"Jenkins2012-05-241-22/+18
|\ \ \ \ \
| * | | | | Use memcache to store consoleauth tokensAnthony Young2012-05-211-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rather than store tokens in a dict, use memorycache so that deployers can optionally use memcached if they would like to run multile nova-consoleauth processes * Fixes bug 989337 Change-Id: I96ec4d796e53b69a494d856269e3c4e8f9b3d222