Remove unnecessary "LOG.error()" statement

Removes apparent debug statement left in from
Ifd41886b9bc7dff01cdf741a833946bed1bdddc

Closes-Bug: #1239603
Change-Id: I9c5b9a6b2349a6c62bef2974ab3b0bb986533741
(cherry picked from commit 7ef98b44374945cd157b125a9b46ee5727d285fe)
Add notification on deleting instance without host

If an instance which does not have a host associated is deleted, the
corresponding notifications were not being sent. Fixed the issue.

Closes-Bug: #1211742

Change-Id: I56482ab38725e6f1ddfb14350637d329f35095b3
(cherry picked from commit bbab55c4da531e4695a6e3e577aaa4975f0fce79)
Fail quickly if file injection for boot volume

Previously if the user attempted file injection on a booted volume it
would fail and retry several times, which slowed down the instance
spawning.  Instead of attempting file injection, fail quickly, and
log a warning

Fix bug 1188543

Change-Id: I264540de736c2bcb92567826fe5ba672e1244ba2
(cherry picked from commit f59c2d64ac8f0523c587e23b2d1c59fdfe7ea131)
Make unshelve use new style BDM

Unshelving an instance requires recreating it, and since change
I5b9c3e2d959c602fa22f49db681da918ae0adcea, it is necessary to call
compute manager's _prep_block_device with new style BDMs.

This patch makes the conductor return new-style BDMs when unshelving the
instance.

Closes-bug: 1246412
blueprint: clean-up-legacy-block-device-mapping

Change-Id: I0ba9f53c31c4d5238319cfd09600ad64f298629e
(cherry picked from commit 7fb9fcc970324236267d893185b421e26b1cb1d9)
Fix setting backdoor port in service start

Previously if self.manager wasn't defined for a Service object but a
backdoor_port was specified then that particular service would not
start because it would try to set the backdoor port in an object that
didn't exist. This commit fixes setting the backdoor port only if
manager is defined when calling start().

Closes-Bug: #1243260

Change-Id: Ib0e709cfd0e299a3e010450b7eba6e92bc108e4e
(cherry picked from commit e5c96505c0b4eac51c0925dcb691f0a1699216ce)
Fix all scripts to honor the enabled_ssl_apis flag

Add logic to allow configuration of SSL for all the cmd scripts
that start a WSGIService

Change-Id: I921013d113081a91a3fe9bb574bae5cd7bb06bcc
Closes-Bug: 1237126
(cherry picked from commit 08c6664d8f36ef48f28bed9afbd4aae21f6eb2d5)
VMware: fix bug for reporting instance UUID's

Ensure that the correct UUID's are reported to the compute
manager. The fix will return only valid UUID's and not all
of the names of the instances running.

Closes-Bug: #1237795

Change-Id: I32bb6f4783dcc80697abebd5a7f45ef9950a0896
(cherry picked from commit 74289aacb5363bd72b449580325a651117e5342d)
Pull system_metadata for notifications on instance.save()

When saving changes on an instance object a notification is sent out.
An attempt is made to pull flavor information from the instance but if
system_metadata is not joined then an exception is raised and the
notification fails.  This ensures that system_metadata is available for
those notifications.

Conflicts:

	nova/objects/base.py

The conflict is from change Icd2944f17b6100d51007dbc48da90e4e992bbd48

Change-Id: Ifd317f847c3839cd6019038bb3dc856b9f107000
Closes-bug: 1244311
(cherry picked from commit e03963b1e42ca2900b108201e77edf2386c5c46a)
Sanitize passwords when logging payload in wsgi

adminPass (or admin_pass) can be either part of a json object or
an xml element or xml attribute. The patch includes
regexps to support all these cases and adds tests
as well

Change-Id: Ic119f986a03863c1d13b566b4c005f3bc77d83d0
Closes-Bug: 1231263
(cherry picked from commit c6d82083295e9b1b42f22d3a2d25a1ab7d341a13)
Merge "Fix all scripts to honor the enabled_ssl_apis flag" into stable/havana
Merge "Remove unnecessary "LOG.error()" statement" into stable/havana
Merge "Make unshelve use new style BDM" into stable/havana
Merge "Sanitize passwords when logging payload in wsgi" into stable/havana
Merge "Add notification on deleting instance without host" into stable/havana
Merge "VMware: fix bug for reporting instance UUID's" into stable/havana
Fixes Hyper-V snapshot spawning issue

In Hyper-V, snapshoting an instance and then spawning a new
one using the resulted snapshot image with the same flavor,
will result an Hyper-V Exception.

Hyper-V will get the request to resize the base image to it's
actual size, leading to an error.

The reason is that the logic of the resize_vhd method has been
changed, as it is meant to resize images to the flavor size minus
the image metadata size, thus it's maximum internal size. For this
reason, the way to decide whether the root image should be resized
or not must also be changed.

So, instead of comparing the root image and base image sizes,
we should compare their maximum internal sizes.

Closes-Bug: #1234759

Change-Id: I83d2df76b726d705cedc52a8309a2be7037d6a79
(cherry picked from commit efdca8eeaffe6e63d57243147658f4691da3d89e)
Merge "Fix setting backdoor port in service start" into stable/havana
Merge "Fail quickly if file injection for boot volume" into stable/havana
Merge "Fixes Hyper-V snapshot spawning issue" into stable/havana
Merge branch 'stable/havana' of https://github.com/openstack/nova into sprint_20131115

Conflicts:
	nova/tests/virt/vmwareapi/test_vmwareapi.py