bug #999953 xenapi driver intermittently fail to detach vbd

ensure that unplug_vbd raises XenAPI.Failure as required by
vbd_unplug_with_retry(session, vbd_ref).

Change-Id: If689da4ebc5d9042f26c765afb02ae611967a66b
Fix bug 1006664: describe non existent ec2 keypair

Change-Id: I92bfd6b51aa31abb06e21893174101da31baffd8
(cherry picked from commit 29baa0ec661c2578ad0aabd138a6b84e5c7a0b40)
Add caching to openstack.common.cfg

Speedup of 'nova list' benchmark by up to 40%, eliminates 3 lines in
top-10 cProfile methods.

(includes subsequent refactoring by Mark McLoughlin)

(cherry picked from commits 0d33dc3, 288939b and acf14ff)

Change-Id: I2d4636f94d88b4a7e38d1565fdd4d1b8a89e560e
Ensure dnsmasq accept rules are preset at startup.

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.

(cherry picked from commit aa1e71d1b313f80f5581b1422e3f3e5719569e50)

Change-Id: Icda3364d3a61018b912cea7a4c96b2cbcc1fbdd7
Add missing ack to impl_qpid.

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
(cherry picked from commit d15f3034dfab05ef0ec02b4e353b3dfa1512db35)
Updates the cache

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
(cherry picked from commit 7097e01a15ecd5c28b6b771e5043f18da243607e)
Merge "Add caching to openstack.common.cfg" into stable/essex
Merge "Fix bug 1006664: describe non existent ec2 keypair" into stable/essex
Merge "Updates the cache" into stable/essex
Merge "bug #999953 xenapi driver intermittently fail to detach vbd" into stable/essex
Merge "Ensure dnsmasq accept rules are preset at startup." into stable/essex
Don't query nova-network on startup.

Backport from commit 8db54f3.
Fix bug 999698.

nova-compute requested network info for each instance on startup via rpc.
If all services get (re)started at the same time, nova-network may not
be available to take this request, resulting in a lost request.  To
combat this issue, get the network info from the cache in the database
on startup.  If by some chance this information is not correct, it will
get fixed up by a periodic task.

Change-Id: Ifb0634e87770f565e4ab36a54f6e9e19e5f31632
Merge "Add missing ack to impl_qpid." into stable/essex
Merge "Don't query nova-network on startup." into stable/essex
Quantum Manager disassociate floating-ips on instance delete.

bug #997763

Change-Id: I4a1e6c63d2a27c361433b9150dd5ad5218578c02
Final versioning for 2012.1.1

Change-Id: Iffd4a65c57be2835238dabfdd9e345355ab47632
Merge "Final versioning for 2012.1.1" into stable/essex
Bump version to 2012.1.2

Set version to 2012.1.2, but with final=False

See http://wiki.openstack.org/StableBranchRelease

Change-Id: Ibc614a6150c0ff57711bfe4c1f4b73567ad32bb9
Set defaultbranch in .gitreview to stable/essex

This allows people run git-review without any arguments.

Change-Id: I2b2488ffffd783b64e5c760324e7d4a00d5a39db
Backport tox settings to unbreak jenkins jobs.

The stable/essex tox config for nova does not currently match the
testing standards that jenkins expects. This backports in current
changes so that jenkins coverage jobs should start passing for
stable/essex.

Change-Id: I0fd476c38d9aea7d1c60cb959d8c7ac30e515d77