summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Implement nova network API for quantum API 2.0Yong Sheng Gong2012-07-036-2/+812
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blueprint improved-nova-quantum-integration This new network API depends on quantum v2.0 client to connect quantum server via Quantum server API V2.0. This change implements the minimum set of methods so that we can boot an instance with ip allocated by quantum server. Change-Id: I34acbbf84dd8601db8143267c8cc41255a0c6d3f
* | | | | | | | Merge "Add ServiceCatalog entries to enable Cinder usage"Jenkins2012-07-034-3/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add ServiceCatalog entries to enable Cinder usageAnthony Young2012-07-024-3/+16
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Part of of blueprint extract-nova-volumes * Adds usage of service catalog to ec2 * Adds entries to auth.py * Implements tests for new authorization mods Change-Id: I2efb375bbb130cde6a1ba119fa862ca45b126a1e
* | | | | | | Merge "use import_object_ns for compute_driver loading"Jenkins2012-07-033-8/+13
|\ \ \ \ \ \ \
| * | | | | | | use import_object_ns for compute_driver loadingSean Dague2012-07-023-8/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of bp:virt-driver-cleanup Convert to using import_object_ns which allows us to import specific virt drivers as 'libvirt.LibvirtDriver' instead of 'nova.virt.libvirt.libvirtDriver'. Update testing to ensure this works with both short names and long names (which need not be in the nova.virt namespace). Change-Id: I5eee3389c7719d5f361532b0eddaa249233283a5
* | | | | | | Merge "Fix nova-rpc-zmq-receiver"Jenkins2012-07-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix nova-rpc-zmq-receiverEric Windisch2012-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging broke with change to stdlib logging, changed to openstack.common log. Use of 'python -d' seems not to work with 'env', and unnecessary. Change-Id: I428c56c612c7d9d043dab2d36b80beb6ca184d27
* | | | | | | | Merge "Fix assertRaises(Exception, ...) HACKING violation"Jenkins2012-07-031-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix assertRaises(Exception, ...) HACKING violationJohannes Erdfelt2012-07-031-2/+3
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This managed to sneak in while tox wasn't gating on hacking tests Change-Id: I2a41ccef740bc602af8819ce03013ce890ff24ce
* | | | | | | Merge "Expand HACKING with commit message guidelines"Jenkins2012-07-031-0/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Expand HACKING with commit message guidelinesBrian Waldon2012-07-021-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a 'Commit Messages' section to HACKING describing how a commit message should be formed. Change-Id: I29b69022dfbdac09523eaa5cef3fc1a4550a7c5f
* | | | | | | Merge "Run hacking tests as part of the gate."Jenkins2012-07-039-18/+23
|\ \ \ \ \ \ \
| * | | | | | | Run hacking tests as part of the gate.Monty Taylor2012-07-029-18/+23
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nova has additional pep8 "plugins" that they expect to run as part of the gate. This patch will run tools/hacking.py instead of pep8 directly. Also, it fixes the hacking violaions in contrib, plugins and smoketests. Fixes bug 1010136 Change-Id: I86d8789218c197d5d4a43d1201465d340646a395
* | | | | | | Prevent file injection writing to host filesystem.Russell Bryant2012-07-032-25/+66
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1015531, CVE-2012-3360, CVE-2012-3361 This patch prevents the file injection code from writing into the host filesystem if a user specifies a path for the injected file that contains '..'. The check is to make sure that the final normalized path that is about to be written to is within the mounted guest filesystem. Signed-off-by: Russell Bryant <rbryant@redhat.com> Signed-off-by: Pádraig Brady <pbrady@redhat.com> Signed-off-by: Mark McLoughlin <markmc@redhat.com> Change-Id: I658cd12fd319cee91eb9544cdf53c862c5d2c560
* | | | | | Switch to common logging.Andrew Bogott2012-07-02243-624/+415
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | I only just moved logging from nova to common, so behavior should remain the same. Change-Id: I1d7304ca200f9d024bb7244d25be2f9a670318fb
* | | | | Merge "Remove duplicate volume_id"Jenkins2012-07-021-3/+2
|\ \ \ \ \
| * | | | | Remove duplicate volume_idHengqing Hu2012-07-021-3/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate key 'volume_id' in a for loop in _update_block_device_mapping in nova.compute.api Change-Id: I43e51cb077334818abea0c1d3bdda4b761406ea4
* | | | | Merge "deallocate_fixed_ip attempts to update deleted ip"Jenkins2012-07-022-2/+36
|\ \ \ \ \
| * | | | | deallocate_fixed_ip attempts to update deleted ipJohn H. Tran2012-06-282-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1017633. When deleting a vm, the nova network manager looks to deallocate wrong fixed ip when context has read_deleted set to 'yes', in case when a network had been deleted and re- created , it attempts to update already deleted fixed_ips and therefore looks to teardown from wrong network_id as well. Change-Id: I574a20273220ef81498403da80f489732ae81eb1
* | | | | | Merge "Refactoring code to kernel Dom0 plugin."Jenkins2012-07-026-104/+146
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Refactoring code to kernel Dom0 plugin.Rick Harris2012-06-296-104/+146
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The kernel and ramdisk VDI manipulation code really has nothing to do with Glance so it doesn't make a lot of sense for it to exist in the Glance Dom0 plugin. This patch refactors the code out to its own plugin and then applies a few misc cleanups. Change-Id: I363d54ea3c2d51aa6a6c1635b4fb59ebb9ce1fc0
* | | | | Merge "Add check for no domains in libvirt driver."Jenkins2012-07-023-5/+17
|\ \ \ \ \
| * | | | | Add check for no domains in libvirt driver.David Shrewsbury2012-06-293-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A check is needed to see if there are any domains before calling the listDomainsID() method. This check is needed to add support for OpenVZ which will throw an exception from this method if there are no domains. The 'virsh' source code does this check, too. This change circumvents this libvirt bug: https://bugzilla.redhat.com/show_bug.cgi?id=836647 Change-Id: Ia71d996722a1b531e720e91c1fa68f561ad4d58d
* | | | | | Merge changes I5b0d4b8e,I61f6734c,Ia2b6e1a7,Ifc1533fe,I306e0f00,I3da35898Jenkins2012-07-0214-238/+312
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Sync rpc from openstack-common. Sync jsonutils from openstack-common. Sync iniparser from openstack-common. Sync latest importutils from openstack-common. Sync excutils from openstack-common. Sync cfg from openstack-common.
| * | | | | | Sync rpc from openstack-common.Russell Bryant2012-07-029-197/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch pulls in the latest changes to rpc from openstack-common. Changes include: 1) Formatting changes. 2) Add a missing gettextutils import to rpc.common and rpc.impl_kombu. 3) Raise an AttributeError from the rpc dispatcher if the version was fine but the method didn't exist. This makes the code match previous behavior pre-version support. Change-Id: I5b0d4b8eced87cfdfdd4ff7827991bbd9cd0ed43
| * | | | | | Sync jsonutils from openstack-common.Russell Bryant2012-07-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch syncs the latest changes to the jsonutils module from openstack-common. It includes a fix for dealing with xmlrpclib.DateTime types in to_primitive() and allows customizing the default param to json.dumps(). Change-Id: I61f6734cdf0c85b56a71b350ca07f564454285a5
| * | | | | | Sync iniparser from openstack-common.Russell Bryant2012-07-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch pulls in the latest version of the iniparser module from openstack-common. It adds support for quoting option values. For example: foo = "option with a trailing space now works " Change-Id: Ia2b6e1a7888ceb04e6befe3b221e3deef9f53f0b
| * | | | | | Sync latest importutils from openstack-common.Russell Bryant2012-07-021-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch pulls in the latest version of importutils from openstack-common. It includes a formatting change and one new function: import_object_ns(). Change-Id: Ifc1533fe1e33a447e4c501d759a6c838133d1063
| * | | | | | Sync excutils from openstack-common.Russell Bryant2012-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch syncs the latest version of excutils from openstack-common. It includes a trivial formatting change. Change-Id: I306e0f00c9398498c298098725f17e5dbfdc0bb7
| * | | | | | Sync cfg from openstack-common.Russell Bryant2012-07-021-36/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change pulls in the latest version of the cfg module from openstack-coludes some formatting changes, spelling fixes, and support for deprecated options. Change-Id: I3da358989209b274799018028bb6bd94d6ffb6bd
* | | | | | | Merge "Add missing gettextutils from openstack-common."Jenkins2012-07-022-1/+34
|\| | | | | |
| * | | | | | Add missing gettextutils from openstack-common.Russell Bryant2012-07-022-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds gettextutils from openstack-common to nova. It is used by rpc, so some parts of rpc are broken without this patch. Change-Id: I0830319f4e2011b87180abcc24354c935bea8d16
* | | | | | | Redefine the domain's XML on volume attach/detachDan Smith2012-07-022-0/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug 1004791 by adding new disk definitions to the defined XML instead of just modifying the running instance. Change-Id: I6596dae7c54158c32bc7b399c55a1797b2d98242
* | | | | | Merge "Create instance in DB before block device mapping"Jenkins2012-07-021-4/+13
|\ \ \ \ \ \
| * | | | | | Create instance in DB before block device mappingEoghan Glynn2012-06-301-4/+13
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes lp 1019334 A recently added foreign key constraint on the the block_device_mapping table causes boot-from-volume to fail, as the bdm is populated before the instance DB entry is created. This fix simply transposes the ordering to avoid breaking the constraint. Change-Id: Ic62ea3ba000a2cdf58d2bd5bb17dde2b8cf340e4
* | | | | | Merge "Flesh out the README file with a little more useful information"Jenkins2012-07-021-13/+49
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Flesh out the README file with a little more useful informationDaniel P. Berrange2012-06-291-13/+49
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current README file contents are amuzing, but could contain more useful information for downstream users / developers. This is an attempt to fill out the README file with further content. Change-Id: I1c364d107d1d6caf110d223560cee3a0a065ee6b Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | Merge "Ability to read deleted system metadata records."Jenkins2012-06-292-7/+5
|\ \ \ \ \
| * | | | | Ability to read deleted system metadata records.Brian Lamar2012-06-292-7/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update _instance_system_metadata_get_query to use read_deleted from the passed in context instead of just hard-coding "no". Also, use this to ensure system metadata is always collected during delete, even if the instance was deleted elsewhere. Fixes bug 1019357 Change-Id: I9285f110801435344fcaa76ba21fb88c23aac2fa
* / | | | Remove passing superfluous read_deleted argumentJohannes Erdfelt2012-06-291-2/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | model_query() will already set read_deleted to context.read_deleted if a read_deleted argument is not passed Change-Id: I3778149e5df4c3a7d62a9cf7186c3f65273359ca
* | | | Merge "OS API should return SHUTOFF, not STOPPED"Jenkins2012-06-292-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | OS API should return SHUTOFF, not STOPPEDChris Behrens2012-06-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent changes to vm_state/task_state changed the behavior of OS API to return STOPPED instead of SHUTOFF. Fixes bug 1019016 The API spec says that SHUTOFF should be returned: http://docs.openstack.org/api/openstack-compute/2/content/List_Servers-d1e2078.html Change-Id: I0a6c786dc8d6b8b42f462cfbec5b70cb67aa2385
* | | | Merge "Add PEP8 checks back for Dom0 plugins."Jenkins2012-06-291-14/+17
|\ \ \ \
| * | | | Add PEP8 checks back for Dom0 plugins.Rick Harris2012-06-281-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1018641 Change-Id: Id61947252fe4d3f5b93279518128ba90100f3748
* | | | | Merge "Dom0 plugin now returns data in proper format."Jenkins2012-06-294-40/+35
|\ \ \ \ \
| * | | | | Dom0 plugin now returns data in proper format.Rick Harris2012-06-294-40/+35
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The virt-layer code was refactored so that a dict was used to pass around which VDIs are present. This code makes the Dom0 plugin return that same data structure so we don't have to perform an extra conversion step. Change-Id: Ib4f1b0082138d233eb0c3873bbc553395510bc8d
* | | | | Merge "Clean up cruft in nova.image.glance"Jenkins2012-06-291-18/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Clean up cruft in nova.image.glanceBrian Waldon2012-06-281-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Directly import glance.client rather than through importutils * Arbitrary code cleanup (spacing, comments, etc) Change-Id: I27410e5e37bcb010e68c964fbdb6d2e46608cc87
* | | | | Merge "Add missing utils declaration to RPM spec."Jenkins2012-06-281-0/+1
|\ \ \ \ \
| * | | | | Add missing utils declaration to RPM spec.Rick Harris2012-06-281-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | `utils.py` was added by the Dom0 plugin refactoring but the corresponding declaration in the SPEC file was forgotten. Change-Id: If12d7389a51928b1f741063e12b3b5a9015d0656