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
Call libvirt_volume_driver with right mountpoint

 * fixes bug 1013782
 * fixes tests for live migration
 * removed test which doesn't apply

(cherry picked from commit 96c86336c69b9d456e43234e3fe315bd3b101045)

Change-Id: I8f95c6baa7aad878af19d5d8b8b34531a4a43885
Stop nova_ipam_lib from changing the timeout setting

 * Fixes incorrect logic for when timeout should be used. We
   want to timeout along with dhcp, and release immediately
   without dhcp
 * Also makes ipam_lib release fixed_ips after floating ips, as
   this is the way that the internal network managers do it.
 * Fixes bug 1014769

Change-Id: I687fac314264b8a89da128ed77c02d9b1ca140ff
(cherry picked from commit 45e98d415ec661ba7772ed2513f2a24ebe68f1dd)
ensure atomic manipulation of libvirt disk images

This pattern could probably be used elsewhere,
but only libvirt disk images are considered for now.
This change ensures there are no stale files left
anywhere in the path from glance, through the libvirt image cache.
These could cause subsequent operational errors either
directly or indirectly through disk wastage.

* nova/utils.py: Add a new remove_path_on_error() context manager
that is used to remove the passed PATH on a raised exception.
* nova/virt/images.py: Ensure temporary downloaded and
converted images are protected.
* nova/virt/libvirt/connection.py: Ensure all the images in
the image cache and instance dirs are protected.

Change-Id: I81a5407665a6998128c0dee41387ef00ebddeb4d
Ensure we don't access the net when building docs

(Note, this has not been sent upstream)

Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
fix useexisting deprecation warnings

Fixes deprecation warnings when using sqlalchemy >= 0.7.0
Fixes bug 941951

Change-Id: Iaa57153f99c60c67a14c1dca849188937bdc5dee
support a configurable libvirt injection partition

This is useful if all guest images have the same structure,
and the root partition is not the first partition.

This is also handy to enable inspection in libguestfs,
which can handle disparate and complicated image layouts.

In future we may change to a StrOpt to support
searching by partition label.

Change-Id: Ie94d61bec8fe4b41d6d2d6d3efa9a4364cf027fe

Conflicts:

	nova/virt/libvirt/connection.py
repeat fusermount to avoid business

Fix bug #1013689

Change-Id: I8ae786e105c08e1b5011a1b2a1dac048a710a1cb
only mount guest image once when injecting files

Previously we could incur the costly guest mount operation twice,
if injecting files with any of net, ssh keys, password, metadata.
Instead now inject files in the same operation.

Change-Id: I250532af14262962777e354324e9aa89d5ecbea1
set correct SELinux context for injected ssh keys

Instruct guests to ensure at boot, that the correct
SELinux context is set for /root/.ssh/.
This will cater for keys injected by nova from hosts
without SELinux (enabled) or using libguestfs which
currently doesn't support setting extended attributes.

Suggested-by: David Naori <dnaori@redhat.com>
Change-Id: Ibf3869e3ee477e91623e0c030838c1ec8a6128a6