summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add instance details to notificationsDoug Hellmann2012-06-181-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 1006120 Ceilometer needs to collect more data for determining the billing rate for an instance. The most efficient way to get that data is to have it included in the notifications sent by nova, rather than looking it up after the notification is received. This change adds details about the location, size, and "type" of the instance to the existing notification data. It also organizes the set of values into groups and adds comments to clarify those groupings. Change-Id: I01b7b550b0c4a5da1cc0dc764c9a6cb0161bf7e5
* | | | Merge "Adjust the libvirt config classes' API contract for parsing"Jenkins2012-06-202-5/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Adjust the libvirt config classes' API contract for parsingDaniel P. Berrange2012-06-192-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't not automatically invoke the 'parse_dom' method from the LibvirtConfigObject constructor, because this is too early in construction - no child class constructors have initialized yet. Instead require the 'parse_dom' method to be invoked after the bare object has been constructed. Also make the default impl of 'parse_dom' take an etree.Element instance and validate its root element name. Add a convenient 'parse_str' method for turning a XML string into an etree.Element instance & parsing it. Change-Id: I7eda2b59869f3b4ef9dce1602cbb05f7662f4528 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | Merge "Remove two obsolete libvirt cheetah templates from MANIFEST.in"Jenkins2012-06-191-2/+0
|\ \ \ \
| * | | | Remove two obsolete libvirt cheetah templates from MANIFEST.inDaniel P. Berrange2012-06-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nova/virt/libvirt*.xml.template and nova/virt/cpuinfo.xml.template files were deleted in earlier commits, so should no longer be listed in the MANIFEST.in file Change-Id: I3a840e6801d02293d0d6b4983d404c1652256cd2 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | Merge "Fix missing import in compute/utils.py"Jenkins2012-06-192-0/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix missing import in compute/utils.pyAlex Meade2012-06-182-0/+27
| | |/ / | |/| | | | | | | | | | | | | | | | | | Fixes bug 1014829 Change-Id: Id4c9225b4b2cec81519155ab660370be4448e366
* | | | Move libvirt version comparison code into separate function helperDaniel P. Berrange2012-06-191-2/+8
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | To help various areas of libvirt driver code to perform version comparisons, move the libvirt version comparison code out of the "init_host" method and into a seperate "has_min_version" helper method Change-Id: Idc54dceff7bda60e1459ebe7c9c60c869d15aedb Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | Merge "Handle missing server when getting security groups"Jenkins2012-06-193-6/+19
|\ \ \
| * | | Handle missing server when getting security groupsMartin Packman2012-06-183-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1010486. Treat InstanceNotFound as a 404 when querying the security groups of server that does not exist. Also removes old exception translation, ApiError no longer exists and NotAuthorized shouldn't need handling at this level. Includes tweak suggested by Mark McLoughlin in review. Change-Id: Iaeada84dbadc232968f792c6f4855bf61cc5a5ae
* | | | Merge "moved update cache functionality to the network api"Jenkins2012-06-1911-139/+198
|\ \ \ \ | |_|_|/ |/| | |
| * | | moved update cache functionality to the network apiTrey Morris2012-06-1811-139/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously the network manager get_instance_nw_info was responsible for updating the cache. This is to prevent calling that function in a confusing way. part 2 of this patch was fixing bug997763 floating_ip_associate was removed from the compute api. network api associate is now called directly. network api floating_ip functions now require instance as an argument in order to update cache. Change-Id: Ie8daa017b99e48769afbac4862696ef0a8eb1067
* | | | Merge changes Ifebbdbf7,I00f431edJenkins2012-06-188-32/+428
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Xen Storage Manager: tests for xensm volume driver SM volume driver: DB changes and tests
| * | | | Xen Storage Manager: tests for xensm volume driverRenuka Apte2012-06-183-8/+158
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifebbdbf70152c5d6587dc26a8789150a7674a768
| * | | | SM volume driver: DB changes and testsRenuka Apte2012-06-185-24/+270
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the storage manager db api code in minor ways like checking for duplicates during creation. Adds tests for the storage manager db api. Change-Id: I00f431ed9137b140f46b4e30cb953792d7307d22
* | | | Merge "bug #996880 change HostNotFound in hosts to HTTPNotFound"Jenkins2012-06-182-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | bug #996880 change HostNotFound in hosts to HTTPNotFounddaisy-ycguo2012-06-142-2/+3
| | | | | | | | | | | | | | | | Change-Id: Ib8b7f1f26c2370e2a82b491d8774797985c0ae98
* | | | Merge "xensm: Fix xensm volume driver after uuid changes"Jenkins2012-06-182-6/+15
|\ \ \ \
| * | | | xensm: Fix xensm volume driver after uuid changesRenuka Apte2012-06-152-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug 1013436 Minor fixes after uuid in volumes were changed from integers. The parameters passed to create_vdi have changed, so modify the call from SM code accordingly Change-Id: I3d61f0221b23bba9a9e218209d5293be8960e2e2
* | | | | Merge "Enforce an instance uuid for instance_test_and_set."Jenkins2012-06-182-7/+7
|\ \ \ \ \
| * | | | | Enforce an instance uuid for instance_test_and_set.Michael Still2012-06-162-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method only has one caller (compute/api.py) and it turns out was already always getting a uuid, so this is a relatively minor change. Change-Id: I5beae5a707be053903f40cc98ed43b66eaf945a9
* | | | | | Imports cleanupZhongyue Luo2012-06-1926-22/+32
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1013770 1. Reorder imports by full module path 2. Insert two blank lines after the last import Change-Id: I294ac3ab528f17a72811392d1732158e9487f3bf
* | | | | Merge "added deprecated.warn helper method"Jenkins2012-06-184-1/+89
|\ \ \ \ \
| * | | | | added deprecated.warn helper methodSean Dague2012-06-184-1/+89
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide a convenience method for indicating in code that a config option the operateor will have to deal with exists in their environment. Change-Id: I17b0c120d54b1db75c6bb29d107e4a15a5202e76
* | | | | Merge "Replaces functions in utils.py with openstack/common/timeutils.py"Jenkins2012-06-1851-419/+380
|\ \ \ \ \
| * | | | | Replaces functions in utils.py with openstack/common/timeutils.pyZhongyue Luo2012-06-1651-419/+380
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1008628 1. Edit openstack-common.conf and import nova/openstack/common/timeutils.py 2. Move time related functions from utils.py to timeutils.py 3. Replace following functions in utils.py with timeutils.py - isotime - parse_isotime - strtime - parse_strtime - normalize_time - is_older_than - utcnow_ts - utcnow - set_time_override - advance_time_delta - advance_time_seconds - clear_time_override 4. Remove datetime related functions and datetime related unittests Change-Id: I9a92be286fb071b6237dd39495d88dae106e2ce0
* | | | | Merge "Add CPU arch filter scheduler support"Jenkins2012-06-185-1/+111
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add CPU arch filter scheduler supportChuck Short2012-06-155-1/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a mixed environment of running different CPU architecutres, one would not want to run an ARM instance on a X86_64 host and vice versa. This scheduler filter option will prevent instances running on a host that it is not intended for. The libvirt driver queries the guest capabilities of the host and stores the guest arches in the permitted_instances_types list in the cpu_info dict of the host. The Xen equivalent will be done later in another commit. The arch filter will compare the instance arch against the permitted_instances_types of a host and filter out invalid hosts. Also adds ARM as a valid arch to the filter. The ArchFilter is not turned on by default. Change-Id: I17bd103f00c25d6006a421252c9c8dcfd2d2c49b Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | Merge "Present correct ec2id format for volumes and snaps"Jenkins2012-06-151-4/+4
|\ \ \ \ \
| * | | | | Present correct ec2id format for volumes and snapsJohn Griffith2012-06-151-4/+4
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1013765 * Add template argument to ec2utils.id_to_ec2_id() calls Change-Id: I5e574f8e60d091ef8862ad814e2c8ab993daa366
* | | | | Merge "Adds property to selectively enable image caching."Jenkins2012-06-152-6/+31
|\ \ \ \ \
| * | | | | Adds property to selectively enable image caching.Rick Harris2012-06-112-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The image-property `cache_in_nova` can be used to choose which images should be cached in Nova. One use-case would be to cache base images but not any customer snapshots. Change-Id: I1b8ac914a6effd4cd4653aae7e4eac9d14d0e7bd
* | | | | | Merge "Cleanup instance_update so it only takes a UUID."Jenkins2012-06-1515-188/+185
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Cleanup instance_update so it only takes a UUID.Michael Still2012-06-1515-188/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You know when you try to do something simple like tweak instance_update and instance_update_and_get_original and it turns out to have all these knock on effects? Yeah, that. I still think this is a good idea though. I'd like to live in a future where we don't have instance ids at all at the DB API level. We need to do this to get there. Change-Id: Ia51d06beaec068a8544642a6a4bf489247ff61a0
* | | | | | Merge "Add libvirt min version check."Jenkins2012-06-152-2/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add libvirt min version check.Dan Prince2012-06-142-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes LP Bug #1012689. Change-Id: I91c0b7c41804b2b25026cbe672b9210c305dc29b
* | | | | | Merge "separate Metadata logic away from the web service"Jenkins2012-06-154-292/+425
|\ \ \ \ \ \
| * | | | | | separate Metadata logic away from the web serviceScott Moser2012-06-064-292/+425
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes here are coming as a result of starting on blueprint config-drive-v2 [1]. I wanted to separate out the "Metadata" from the "Metadata Server". Thus, the creation of nova/api/metadata/base.py. The InstanceMetadata in base.py contains most of the logic for presenting metadata. As a result, the Metadata webservice in handler.py greatly simplified. This should make it easier to render duplicate data to a config drive. Additional changes here: * a few more tests * removal of the separate 'Versions' handler. Its now replaced by the single handler. Change-Id: I35fcfd8d7f247763954afc0a9f752f629b243e9b
* | | | | | | Merge "Revert "Fix nova-manage backend_add with sr_uuid""Jenkins2012-06-151-22/+21
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Revert "Fix nova-manage backend_add with sr_uuid"Renuka Apte2012-06-111-22/+21
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 988596 Change 77495cfe breaks storage manager, as it makes a wrong assumption about nova-manage. The sr-uuid must be generated and provided by the xenapi storage manager. When the volume service is started, SM volume driver will create a new SR for everything that does not have an existing sr_uuid and will populate the db with the result. It will only introduce the SRs that do have one. The introduce will work only if the uuid provided is something SM understands. This partially reverts commit 77495cfed17f12f225e11fbc10e0f8db516dadf2. Changes in db are left intact. Change-Id: I8405ac905a15f829f704951b94297f3b6f6c0a29
* | | | | | Merge "Unwrap httplib.HTTPConnection after WsgiLimiterProxyTest."Jenkins2012-06-152-1/+12
|\ \ \ \ \ \
| * | | | | | Unwrap httplib.HTTPConnection after WsgiLimiterProxyTest.Eric Harney2012-06-132-1/+12
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1007307. Change-Id: I0b84d29a86a727b611f60f6be15a6d0d21c17a4b
* | | | | | Merge "Add missing ack to impl_qpid."Jenkins2012-06-142-1/+10
|\ \ \ \ \ \
| * | | | | | Add missing ack to impl_qpid.Russell Bryant2012-06-132-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1012374. Johannes Erdfelt pointed out that impl_qpid wasn't acking messages that it received. This turned out to be a nasty oversight, resulting in unbounded message queue growth inside of the python-qpid library. This fixes it. Change-Id: I0370293807f0282e1dbdd59246f70be031e888a9
* | | | | | | Updates the cachedeevi rani2012-06-143-0/+11
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug 939122 Following are the changes done: 1. in compute/api.py to display the floating ip in nova list command upon its association with an instance. 2. in network/api.py to solve the similar issue upon the floating ip disassocaition Updated version of: https://review.openstack.org/#/c/7059 Change-Id: Ief1a3f544c3d14bd61cc0814612df3ee521ddec2
* | | | | | Ensure dnsmasq accept rules are preset at startup.Russell Bryant2012-06-141-0/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1000853. This bug reported that after restarting nova-network, the dnsmasq ACCEPT iptables rules were no longer present, causing instances to lose their IP addresses. This patch updates the restart_dhcp() function in the linux_net driver to ensure these rules are present even if dnsmasq was already running. Before this was only done when first starting dnsmasq. Change-Id: Icfbe6177d4c913c3d7755ca40a71752bcdaa4448
* | | | | Merge "Dedupe native and EC2 security group APIs."Jenkins2012-06-149-830/+835
|\ \ \ \ \
| * | | | | Dedupe native and EC2 security group APIs.Eoghan Glynn2012-06-129-830/+835
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the code duplication in the native openstack and EC2 APIs related to security groups, by factoring commonality into a new internal SecurityGroupAPI. Also fixes bug lp 1005931 Change-Id: Ifb92bf5d0f07d5713818a3eee6175ef03e8c0b7c
* | | | | | Re-add private _compute_node_get call to sql api.Dan Prince2012-06-141-1/+11
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-adds a private _compute_node_get call to the sql api. This call is in used by the compute manager. Fixes LP Bug #1013061. Change-Id: I28c578509ac70ac7bccede41c3210a46ae56e717
* | | | | Merge "Add two missing indexes for instance_uuid columns."Jenkins2012-06-133-0/+45
|\ \ \ \ \