Merge "LXC: Image device should be reset in mount() and teardown()"
Pass rbd_user id and conf path  as part of RBD URI for qemu-img

Unlike rados.py, qemu-img does not use id from CEPH_ARGS and has to be
given a ceph user id and conf path explicitly in RBD URI

Closes-Bug: #1261675
Change-Id: I9226515f2a860ed45d12012fd5b6bc7e842f6d32
Change RPC post_live_migration_at_destination from call to cast

We don't expect post_live_migration_at_destination to return anything,
so change call to cast.

Change-Id: Iccdb6e195d1d5d9b96e1372206823d414caae872
Merge "libvirt: consider minimal I/O size when selecting cache type"
Cleanup object usage in the delete path

This patch cleans up some dict-like usage of instances in the compute
api path, as well as removes a redundant direct call to fetch the
instance's system_metadata.

Related to blueprint icehouse-objects

Change-Id: I1cf89f0a46280b53d7d929ca61dde1cb3ea3cace
Fix interprocess locks when running unit-tests

When running unit-tests concurrently using testr, we might
need to use interprocess file locks (e.g. for running various
tests using the same DB in MySQL/PostgreSQL).

At the same time file locks are only usable when they are placed
to one dir, and we have a test fixture that overrides the lock_path
config value for each test case with a new temporary directory.

The solution is to create the one temprorary directory for locks
to be used by all tests before running tests and then remove it
after running tests. The corresponding helper has been already
put to openstack.common.lockutils module, we just need to reuse
it properly, i.e. change the way unit tests are run in tox.ini.

Closes-Bug: #1261728

Change-Id: I76f95a9f7fdd31c15e6cf4fd6316c7569284f780
Make _change_index_columns use existing utility methods

The _change_index_columns method is doing a drop/add index operation and
since we have utility methods to do exactly that already, just re-use
them.

Change-Id: I5706c4512b1324aab64f70cd053c464d9a50e233
When inject admin password, no need to generate temp file

Remove the useless steps in _inject_admin_password_into_fs function

Change-Id: I878c7d6d8c081c98e2e5eb2706bfa0d17d298f07
Change default ephemeral FS to ext4.

The ext3 filesystem does orders of magnitude more I/O than ext4 in
mkfs - a brief benchmark showed 14m to make a 1TB ext3 filesystem
vs 7 seconds to make a 1TB ext4 filesystem, with the ext3 filesystem
doing upwards of 6GB I/O.

Since ext4 has been a default in all major Linux distributions for
a long time now - RHEL5 has it as default, for instance - there is
no reason to default to ext3: users that need ext3 can configure
that themselves.

DocImpact

Change-Id: I833356af81df743a63d4442d389be82bc25f3914
Spelling fix resouce=>resource

Change-Id: I369d925573e6ce7b48f610051f3b53a4afbb3d0d
Fix parameter checking about quota update api

In quota_classes and quotas update API, parameters are checked
whether they are integer or not.
But when pass float values to these APIs, error doesn't occur.
Float values should be forbidden for the following reasons.
(1)If the value that user submitted and the value registered
   actually are different, user will be confused.
(2)Error messages of these APIs are "...must be integer...".
(3)In horizon, if a float is submitted, error message is displayed.

This patch fixes this problem.

Change-Id: I4c7df52ffff2d997da4e6267e25ec2ea4ab6f153
Closes-Bug: #1243037
Merge "Fix parameter checking about quota update api"
Merge "Fixes get_vm_storage_paths issue for Hyper-V V2 API"
Merge "When inject admin password, no need to generate temp file"
sync oslo service to fix SIGHUP handling

this is a sync of the oslo service code to fix a bug found in
the sighup handling. Previously it was not possible to use
devstack's unstack.sh because the service module would always
restart under a SIGHUP, not only when the process was running as
a service. SIGHUP on a non-detached process should act like
SIGTERM. This change fixes that.

Change-Id: Ib260d82519fde5c5cb24a2c0c8a7cccd0b96b84f
Related-Bug: #1263122
Merge "Fix interprocess locks when running unit-tests"
Revert recent change to ComputeNode

This reverts the object-related parts of 4c21f4a. The problems with
it are:

- It didn't bump the object version
- It introduced a JSON blob string attribute to the object,
  which is unversioned structured data, which can't be
  checked or guaranteed during upgrades.

The first one, of course, breaks live upgrade because an older
node receives fields it doesn't know about, but should based on
the version.

Offending change I75e339c2a2827875078c937e57c37e85d3ad1852

Change-Id: Ie280dc6fe27e48aea9939131c9e695c60b132414
Merge "sync oslo service to fix SIGHUP handling"
Merge "remove vmwareapi.vmops.get_console_output()"
Merge "List NotImplementedError as a client exception for vnc"