Use ScaledResource as type for InstanceGroup members

Use the placeholder type OS::Heat::ScaledResource as the nominal resource
type for resources in an instance group. Use the environment to select the
actual underlying resource type (current AWS::EC2::Instance).

Change-Id: I52252c596fa48e57d927eb78e9d5b7c8261adb3e
Update tox.ini to use new features

tox 1.6 allows us to skip the sdist step, which is slow. This does that.
It also allows us to override the install line. In this case, it's
important as it allows us to stop getting pre-release software we
weren't asking for.

Original patch by Monty Taylor, talked about here:
http://lists.openstack.org/pipermail/openstack-dev/2013-September/015495.html

Change-Id: I9fe8a6cff149b3b79d434dc955c77a358c43031d
Remove unused dumps validation in JsonParam value

If the passed parameter is not a valid Json object, a ValueError
exception will be raised in JsonParam parse(). So no need this dumps
validation in value().

Change-Id: Ie450d3923a905b7de3dcbece351aec937ebe7a61
Sync oslo threadgroup.py to fix wait & stop methods

Sync oslo threadgroup.py to 25ff65e955b7ef1091722224f7c71f14fc971354 so
we include the fix for bug #1196525, which resolves a problem where the
wait and stop methods would not actually wait for/stop all threads in
the thread group.

Change-Id: Ia49d7096180b2942cf49b1f0dacde3c5e933337c
Allow docker plugin to run w/o deps

The docker plugin tests would not run without the docker lib being
installed even though the client was mocked in the tests. This
patch adds conditional import of the client and registration of
the plugin so that the contrib tests can be run in the gates
without having to hack requirements or add more third party
libs.

Change-Id: Ia114f8ebc0cf0b72af8e6e5d2c3264fb7952d7f9
Partial-Bug: #1251380
heat-manage man page not generated in doc build

Was missing entry in the build configuration file.

Change-Id: I38a28a39936381303f87c676baa7075d5aa87440
Closes-bug: #1259674
Implement engine listener service for multi-engine support

The engine listener service provides a way for engines to confirm that
other engines are still alive.  For example, during acquisition of a
stack lock, if an existing stack lock is found the engine will attempt
to communicate with the engine who owns that lock.  If the engine
responds affirmatively, the lock will be considered active.

Blueprint multiple-engines

Change-Id: I6d8f1305953212408f19688a1e0af81c44e5e5b4
Utilize stack-lock for multi-engine support

Utilize a distributed stack lock to avoid race conditions when multiple
engines are deployed.

Blueprint multiple-engines

Change-Id: I2278c7922557b6234cd7ff162cea92af83e9fb8b
oslo: update the remainder of the modules

Change-Id: I83796c1e1f2f69d2ce27e7180c4004a5f345f063
Remove unused variable badkeys

Since it's never used and consumed a set subtraction.

Change-Id: Ic2231ad5e491527c7f746172d9a3e07a6623b823
Don't replace (and log) the same resource entry

Resources may be registered multiple times. This
ensures that logs are only emitted the first time
a resource is registered.

Change-Id: Iedd12d55007ee24ea6ecbe4fe7152ff65ea665b0
Make the mountpoint property description clearer

There is an issue where the mountpoint may not be honored
so add this note to the property documentation so users can be
aware of the issue.

Change-Id: Iddab9b1f6e5fadddd00e651e92b8b9c922a59347
Closes-bug: #1231705
Add support for network name for os::nova::Server

Property 'network' is added to networks schema of the resource
os::nova::Server. It takes uuid or name. The 'uuid' property is deprecated.

Change-Id: I790bd23301ecfb7b8aa22f6c42b9e6c01cd0b186
Closes-Bug: #1247019
Fix missing policy enforcement in CFN API

Currently the CreateStack and UpdateStack actions aren't correctly
enforcing the policy, so add calls to _enforce which fixes that,
and rework the test to illustrate the issue.

Change-Id: Ia5c2e65512ab9d1c163171f8617c081ab96745e5
Closes-Bug: #1256049
Add validation for an existence of a resource type

Validation of resource type existence was missing.
The patch adds validation checks that in the template the resource
type is set and is not an empty string.

Change-Id: I171644010ec868e8acc4c29556889256e8bf51b6
Closes-Bug: #1257243
Merge "oslo: update the remainder of the modules"
Merge "Remove unused variable badkeys"
Merge "Sync oslo threadgroup.py to fix wait & stop methods"
Deny API requests where context doesn't match path

We shouldn't overwrite the context tenant_id (which comes from the
scope of the auth_token) with that from the path, instead raise a
HTTPForbidden exception if the path-provided tenant_id doesn't match
the context.

Change-Id: Ib6fb9881103312f7492081a20178f12309f35d81
Closes-Bug: #1256983
Merge "Fix missing policy enforcement in CFN API"