Merge "Disable per-user rate limiting by default"
Merge "Make ServerXMLSerializationTest DRYer"
Merge "Merged flavorextradata extension (ephemeral disk size) into core API"
Merge "Fix extensions agent follow API v3 rules"
Merge "Add expected_errors for extension_info V3"
Moves compute.rpcapi.prep_resize call to scheduler.manager

This change removes the scheduler_prep_resize method from
the scheduler drivers and put the logic on the scheduler
manager instead.

This is part of other changes that will completely move
cold migration related tasks to conductor. Next change
will move the scheduler manager prep_resize logic to
conductor.

Partially implements bp cold-migrations-to-conductor

Change-Id: Iab6d414acfa32eeb36a2b8cf358ce5948652c49c
Merge "Config drive attached as cdrom"
add vendor_data to the md service and config drive

There was not previously any way for a vendor to extend the metadata
service to include vendor specific or site specific information.

This adds an entry named 'vendor_data.json' to the metadata service, and also
to the rendering on config-drive.  vendor_data is intended to be a un-managed
place for cloud providers to put custom data that will then be available to the
instances.

The class used to generate the data is configurable via the flag
'vendordata_driver'.  The default class, JsonFileVendorData simply
loads data from a file that is configurable via 'vendordata_jsonfile_path'.
If that variable is not set, a empty dictionary is returned.

By setting
 vendordata_jsonfile_path = /etc/nova/vendor_data.json

The cloud provider can then expose custom data to all instances.

blueprint vendor-data
DocImpact

Change-Id: Ie2aceff1bf68edab124cd5f889aa9a8adcdc73c0
Merge "Implements host uptime API call for cell setup."
Merge "Fix flavor_access extension follow API V3 rules"
Add error checking around host service checking

If the host provided doesn't exist in the table, nova-manage will spit a
traceback out, which isn't very friendly. This patch copies the same
code used in other nova-manage commands to wrap the offending call.

Change-Id: I606b22f0cea523809fcfa34f5b61ce70ba8d6152
xenapi: no image upload retry on certain errors

There are a few upload errors that glance plugin should
not retry upload on, as it will fail again. This patch changes
upload to not retry on the following conditions in addition
to the 401 error that it already handles:

- CONFLICT
- REQUEST_ENTITY_TOO_LARGE
- PRECONDITION_FAILED
- FORBIDDEN

Fixes bug 1203726

Change-Id: I538a4f9b133169b2e398e7dfcb3af58fef204f03
EC2-API: Fix ambiguous ipAddress/dnsName issue

Currently, the public ipAddress and dnsName take in either the
fixed or floating IP address as a value. The current fix ensures
that the public dnsName and the public ipAddress both get only
the floating ip address. A look into Amazon's EC2 API Reference
tells us that if there is no public IP associated with an instance,
an empty value is returned for <dnsName> and the key <ipAddress>
itself is never returned. This was tested with euca2ools.
Also, the key <publicDnsName> has been removed since it is
the same as <dnsName>

Fixes: bug #1096468

Change-Id: I3b3e3b3f815df41d1976444d33604363e64a7709
Remove * import from xenserver plugins

Recently a change was made to how/where the '_' method is imported. This
seems to have broken most xenserver plugins. These plugins shouldn't be
doing * imports anyway so I've gone in and cleaned up all places where
"from pluginlib_nova import *" was used and replaced with "import
pluginlib_nova".

Fixes bug 1207107

Change-Id: I3b2a299cf60543e0f766becfeb4740af791b3576
Sync config.generator from Oslo

Includes:
7448e7e Fix hostname conflict in config generator

Fixes bug 1205411

Change-Id: I13988ef73db05bbdab355400c19e1ad136b59fc0
Use cached nwinfo for secgroup rules

This stops a potential DOS with source security groups by using the
db cached version of the network info instead of calling out to
the network api multiple times.

Fixes bug 1184041

Change-Id: Id5f24ecf0e8cce60c27a9aecbc6e606c4c44d6b6
Merge "Fix v3 hypervisor extension servers action follow REST principles"
Add expected_errors for extension shelve v3

Partially implements bp v3-api-extension-versioning

Change-Id: I79fd18cf99e741a468f5aa2326942c3e818c6ac6
Merge "Correct status code and response for quota_sets API v3"
Merge "Add expected_errors for extension server_diagnostics V3"