bbeb53771264dc95e57f96a6fe2a747d5a550b6c
Commit Graph

23315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenkins
ae149ede64 Merge "PCI devices resource tracker" 2013年08月30日 22:57:47 +00:00
Jenkins
7e8f27e1eb Merge "Adds Instance UUID to rsync debug logging" 2013年08月30日 22:52:24 +00:00
Jenkins
cd87df3c36 Merge "Make resource_tracker record host_ip" 2013年08月30日 20:21:03 +00:00
Jenkins
2ddb08e520 Merge "Unimplemented suspend/resume should not change vm state" 2013年08月30日 19:55:14 +00:00
Russell Bryant
579109cab9 Sync rpc from oslo-incubator
This includes:
76972e2 Support a new qpid topology
284b13a Raise timeout in fake RPC if no consumers found
9721129 exception: remove
7b0cb37 Don't eat callback exceptions
69abf38 requeue instead of reject
28395d9 Fixes files with wrong bitmode
bec54ac Fix case error in qpid exchange type "direct"
61c4cde Ensure context type is handled when using to_dict
223f9e1 Clarify precedence of secret_key_file
a035f95 Don't shadow cfg import in securemessage
0f88575 Remove redundant global keyword in securemessage
848c4d5 Some nitpicky securemessage cleanups
5c71c25 Allow non-use of cfg.CONF in securemessage
9157286 RPC: Add MessageSecurity implementation
2031e60 Refactors boolean returns
a047a35 Make ZeroMQ based RPC consumer threads more robust
34a6842 On reconnecting a FanoutConsumer, don't grow the topic name
f52446c Add serializer param to RPC service
5ff534d Add config for amqp durable/auto_delete queues
7bfd443 Avoid shadowing Exception 'message' attribute
Closes-bug: #1178375
Change-Id: Ib5d4733743041eb2324020f9b1dc553260e79b21
2013年08月30日 14:56:30 -04:00
Jenkins
90c842e124 Merge "Disable compute fanout to scheduler" 2013年08月30日 18:55:12 +00:00
Jenkins
224531bc55 Merge "Make image_props_filter use information from DB not RPC" 2013年08月30日 18:54:40 +00:00
Jenkins
317cda1e0b Merge "Make compute_capabilities_filter use information from DB not RPC" 2013年08月30日 18:54:01 +00:00
Stanisław Pitucha
8c169aa41b Fix the multi-instance quota message
Make sure that when spawning multiple instance, the quota exceeded
error still makes sense. Instead of reporting min_count (1) as the
requested number, report "between min_count and max_count".
Fixes bug 1211347
Change-Id: I5a562253788f93b932ccd99bd1dc6630444bd430
2013年08月30日 18:05:00 +00:00
Chris Krelle
b64eca85b2 Fix virtual power driver fails silently
This patch changes the behavior of Virtual Power driver. VPD will
now raise an exception should the mac address for the node not
be found. It will also log the node name and mac address.
fixes bug 1201964
Change-Id: I04a275cf8d2cc7665720329000fbe087aa636b21
2013年08月30日 10:57:42 -07:00
Davanum Srinivas
3c59d998c5 VMware: Config Drive Support
Create the config drive iso, upload it to the correct location,
then create a VirtualMachineConfigSpec with appropriate contents
and run the ReconfigVM_Task to enable the iso.
DocImpact
Fixes LP# 1206584
Fixes BP vmware-config-drive-support
Change-Id: I1df1e61edbff9f3a68940d3e3e87fea3be838d11
2013年08月30日 13:31:02 -04:00
Jenkins
3b2931a5a7 Merge "XenAPI: More operations with LVM-based SRs" 2013年08月30日 17:30:59 +00:00
Jenkins
82acbcc28d Merge "XenAPI: make_partition fixes for Dom0" 2013年08月30日 17:30:20 +00:00
Jenkins
3951958a1f Merge "Fix and gate on H302 (import only modules)" 2013年08月30日 17:29:36 +00:00
John Garbutt
4d5c2f13e8 xenapi: skip metadata updates when VM not found
There is a race condition where change_instance_metdata requests still
get to the compute nodes when the VM has a task in operation that means
the VM is no longer present. This change ensures that we skip the
metadata updates when this occurs.
Currently, if this happens, the long running task, like rebuild or
resize will fail because the VM task_state=None and is put into ERROR.
After this change, it will silently fail, and the updated metadata will
be written when the VM gets re-created as part of the long running
operation.
Fixes bug 1207238
Change-Id: I75e1f93e34d3b3ab93a8e8104fd64224f72d7309
2013年08月30日 17:06:34 +00:00
Joe Gordon
b5eaaf73c4 Make resource_tracker record host_ip
Now that the host_ip, for affinity_filters, is coming from the DB and
the host_ip is virt driver independent so make the resource_tracker add
it.
part of bp no-compute-fanout-to-scheduler
Change-Id: I498578191b0af97cb91ca0d81b7ad1eeaf8fd995
2013年08月30日 12:54:03 -04:00
Joe Gordon
674ef05b0a Disable compute fanout to scheduler
Now that nothing is using publish_service_capabilities it can be
disabled, but not removed in order to not break compute rpcapi backwards
compatibility.
Part of bp no-compute-fanout-to-scheduler.
Change-Id: I80c49c46138fd6ee89cb08ffbbced72ada4de72e
2013年08月30日 12:54:03 -04:00
Joe Gordon
5ce74eb546 Make image_props_filter use information from DB not RPC
Make image_props_filter directly use the data from host_state and not
the data from capabilities that is currently broadcast from the
scheduler over RPC, as this will be removed since it doesn't scale.
Once all capabilities usage in scheduler filters is
removed the capabilities RPC broadcast can be removed.
Part of bp no-compute-fanout-to-scheduler.
Change-Id: I5e6bcec517edbf606903c3e98f3c63f7ba370bcf
2013年08月30日 12:54:03 -04:00
Joe Gordon
108b83a4c1 Make compute_capabilities_filter use information from DB not RPC
Make compute_capabilities_filter directly use the data in host_state and
not the data capabilities data that is currently broadcast from the
schedulers over RPC, as this will be removed since it doesn't scale.
The filter name, compute_capabilities_filter, is kept the same to keep
backwards compatibility.
This is a second attempt at this patch the first one broke the ability
to filter an arbitrary key value pairs, this time that is supported via
host_state.stats, along with tests to confirm
Once all the capabilities usage in scheduler filters is removed, the
capabilities RPC broadcast can be removed.
Part of bp no-compute-fanout-to-scheduler.
Change-Id: I0b9b05a25a8c1841093913c4a2fb19b48aff2ae1
2013年08月30日 12:52:57 -04:00
Bob Ball
9301e04904 XenAPI: More operations with LVM-based SRs
Some operations require Files-based SRs (ext3/NFS) - such as resize
and VHD download. However, if using 3-part images or RAW then most
operations can be successful with this simple fix.
Fixes bug 1162382
Change-Id: Ia3d1c64871d78ab1bf6e197edaeee170d2b5dea8
2013年08月30日 17:16:26 +01:00
Bob Ball
cf796b6477 XenAPI: make_partition fixes for Dom0
When running in dom0, the calls to parted fail to re-read the partition
table so we have to use kpartx to read it specifically.
The failure to re-read the partition table also means that the exit code
is non-0.
Implements blueprint xenserver-core
Change-Id: I56ca25874d6491b0ed70e5efd477254bfe47294d
2013年08月30日 17:16:26 +01:00
Jenkins
d734bd5871 Merge "XenAPI: SR location should default to location stored in PBD" 2013年08月30日 15:44:18 +00:00
Jenkins
57d583bf47 Merge "XenAPI: Generic Fake.get_all_records_where implementation" 2013年08月30日 15:43:38 +00:00
Jenkins
6b27e07d4b Merge "xenapi: agent not inject ssh-key if cloud-init" 2013年08月30日 15:40:36 +00:00
Jenkins
1a051613bb Merge "Fix usage of classmethod in various places" 2013年08月30日 14:50:35 +00:00
Jenkins
dd839df2a3 Merge "powervm: make start_lpar timeout" 2013年08月30日 14:43:34 +00:00
Lucas Alvares Gomes
281e2a1062 Fix wrong method call in baremetal
The `get_pxe_config_file` method is not part of the PXE class.
Change-Id: Ife4f5332af05fd82a865ecdbddf7c5431eb29c1d
Closes-Bug: #1218779 
2013年08月30日 15:02:13 +01:00
Jenkins
e64683f96f Merge "powervm: revert driver to pass for plug_vifs" 2013年08月30日 13:54:19 +00:00
Matt Riedemann
3fe738afc8 powervm: make start_lpar timeout
This patch makes the start_lpar method timeout like the stop_lpar
method.
Change-Id: I111ed7ee80f7a9e786d8cb8b02747b5187120858
2013年08月30日 13:29:39 +00:00
Jay Lau
90620a27e0 Disable retry filter with force_hosts or force_nodes
If customer deploy a VM with force_hosts or force_nodes options,
then there is no need to retry even if retry filter was enabled.
Fix bug 1211597
Change-Id: I2948f48b5c4982cc29899b76889d7d8f0db47449
2013年08月30日 20:33:41 +08:00
YangLei
df44a7e25d Call safe_encode() instead of str()
To avoid the error in python2.6:
"UnicodeEncodeError: 'ascii' codec can't encode characters",
use safe_encode() to encode basestring instead of str().
Fix bug #1218719
Change-Id: Id26f23ad7f975a3a50750927adbedb86bf80871d
2013年08月30日 17:08:07 +08:00
Julien Danjou
f1e55f6d5f Fix usage of classmethod in various places
The decorator @classmethod isn't always correctly used in the code base,
this patches fixes some places where it was not used correctly.
Change-Id: Ifd4113b693889de0becc37854f4c62faf2fdab11
2013年08月30日 10:14:48 +02:00
gtt116
d82f267d03 Fix V3 API quota_set tests using V3 url and request
V3 tests should using V3 url. Also to make code style consistence, using
V3 HTTPRequest.
part of blueprint v3-api-unittests
Change-Id: Ief1df0bb591941cfaf9555e97bccf21fe1e56594
2013年08月30日 15:29:31 +08:00
Matt Riedemann
2d20b87aef Handle port over-quota when allocating network for instance
This patch adds a check in the neutron API for a port create failure due
to over-quota in neutron and raises the new exception PortLimitExceeded.
Also moves the port-create block of code into it's own method to
try and clean up some of the large allocate_for_instance method.
Closes-Bug: #1207914
Related-Bug: #1209446
Change-Id: I4000c8ab550e032363f138a86e1b87f6ab2f5ff2
2013年08月29日 23:50:58 -07:00
Matt Riedemann
d77ad1ac56 Fix warning log message typo in resource_tracker.instance_claim
Just cleans up a small typo in a warning log message that the resource
tracker gives when 'node' is already set on the instance during a claim
operation.
Change-Id: Ic1ece4451f54f4efc8028f8d90de5d240910b20e
2013年08月29日 23:44:03 -07:00
Jenkins
86c97ff020 Merge "powervm: Use FixedIntervalLoopingCall for polling LPAR status" 2013年08月30日 01:44:03 +00:00
Sabari Kumar Murugesan
cf681ca467 Fix VMware fakes
The mock vmware objects in fake.py incorrectly represent the
corresponding vSphere server objects. This patch aims to fill
those gaps in the testing framework.
Fixes: bug #1200482
Change-Id: Idc1f93af466e1521c6df655d2851cd923507cc07
2013年08月30日 00:33:14 +00:00
Mark McLoughlin
e982536084 DRY up use of @wrap_exception() decorator
We pass the same args to this decorator everywhere, except we have a
different publisher ID for compute api versus compute manager. Use
functools.partial() to avoid this repitition.
Also, this decorator changes with the port to oslo.messaging and this
change reduces the number of places affected by that.
blueprint: oslo-messaging
Change-Id: I54fee992a9995ad3085a6ccd1627958f6dd9ad60
2013年08月30日 00:52:45 +01:00
Mark McLoughlin
f9d66c12b5 Remove unused fake run_instance() method
In a bunch of tests, we stub out rpc.call() and use it as a hook to
create instances and return their details.
The thing is, we never actually call() 'run_instance anymore .. we
always cast() it. So, these fake methods never actually get called and
can be safely removed.
A similar change was made in I63bbc98c285faebec53f8e62857c01548807db68
but some more copies of this have been added recently. Copy and pasted
code FTW!
blueprint: oslo-messaging
Change-Id: I1a5a048ed9b0d939d50f7728a348bb6c5a6074dc
2013年08月30日 00:52:45 +01:00
Mark McLoughlin
558e685d71 Use ExceptionHelper to bypass @client_exceptions
Rather than stubbing out catch_client_exception() to bypass the wrapping
of exceptions in ClientException, use the existing ExceptionHelper to do
it.
This is important for oslo.messaging, because there's no public API
method for us to stub out.
This is a continuation of I32c83ef15fece35526739c4fcdfccf7a275c7033 as
another stub_out_client_exceptions() usage got merged by
I4120156db1499dfd3ed22095e528787eb73d33a6.
blueprint: oslo-messaging
Change-Id: If4ff9dba58e9f94fab80be804a98c76fff3267b7
2013年08月30日 00:50:56 +01:00
Sam Alba
5ad4f20de3 Added new hypervisor to support Docker containers
Docker brings an alternative to support Linux Containers (LXC)
as instances. The code has been imported from:
https://github.com/dotcloud/openstack-docker
blueprint new-hypervisor-docker
Change-Id: I0f1ff8acb5a93ba1dc680c68633c43454d1e804c
2013年08月29日 16:12:18 -07:00
Jenkins
ced24c9f3f Merge "PCI device auto discover" 2013年08月29日 22:48:01 +00:00
Jenkins
ed9cf811c6 Merge "Add PCI device filters support" 2013年08月29日 22:47:29 +00:00
Jenkins
87b3d3a6f0 Merge "Revert task state when terminate_instance fails" 2013年08月29日 21:28:55 +00:00
Jenkins
e3eb1a5dd0 Merge "Remove capabilities.enabled from test_host_filters" 2013年08月29日 21:15:09 +00:00
Jenkins
f4f83ca5d0 Merge "Add context information to download plugins" 2013年08月29日 20:20:12 +00:00
Jenkins
b42c6db905 Merge "Add volume snapshot delete API test case" 2013年08月29日 20:12:18 +00:00
Jenkins
31d02b5ab2 Merge "Assisted snapshots compute API plumbing" 2013年08月29日 20:11:39 +00:00
Jakub Ruzicka
260f82815b Introduce InvalidPermission.Duplicate EC2 error code
New SecurityGroupRuleExists exception with 'InvalidPermission.Duplicate'
ec2_code attribute replaced useless EC2APIError.
Note that this error isn't about duplicate group as the code suggests,
but about duplicate permission within a group.
Implements: blueprint ec2-error-codes
Change-Id: I42c94e15a6ca1bc57b10fb683bec17b73de0e0e5
2013年08月29日 18:24:24 +02:00
Jenkins
61fdbf194d Merge "fix bad usage of exc_info=True" 2013年08月29日 16:19:19 +00:00