Updated from global requirements

Change-Id: Id185bb8f180f169072a821b95a774a297db8db1e
Split keystone away from heat collector

This will help segregate the changes as we abstract away details of
keystone such as caching the tokens.

Change-Id: I81ccb17658e5c9fa349fb183240f901d61b1fa93
Related-Bug: #1321437
Add dogpile cache to keystone abstraction layer

In later commits we will use this cache to memoize access to the
authentication details.

Change-Id: I389f78fe1eb176e37c90a1a87a4ba5fde3b33f05
Related-Bug: #1321437
Cache auth_ref from keystoneclient

Auth_ref is documented as a serializable object which we can save off
and use to reinitialize keystoneclient. That should in turn be passable
to heatclient directly. With this code, we will avoid authorizing with
Heat if we have a token in the cache.

Change-Id: I3dc6c3726054e77449cc9be46229e6d3521d4ef2
Closes-Bug: #1321437
Make heat the default collection method

Previously we were relying on the CFN compatibility API. This makes the
native Heat version the default.

Note that we want to keep full coverage, which is why we are explicitly
adding cfn back in during tests.

Change-Id: I5adedd052827e176e2f39071c719600df62019d7
Closes-Bug: #1321551
Revert "Make heat the default collection method"

This reverts commit 6b478e9d90bce18b03f5411822897740f68c3dd0.

We will break anybody who is expecting CFN to be tried in all
circumstances with this. We probably just need to base which collectors
to try on what configuration we have, and not log warnings on
unconfigured collectors.

Change-Id: I4bf7d6f9af9487bf9d2c0942381c0ba68fc03ee9
Do not log unconfigured collector as warning

The configuration will dictate whether or not something is configured.
If it is not, this is a normal state and should not be logged as a
warning.

Change-Id: I479f0aed5837871009bc69fa028f5eb64a060c53
Closes-Bug: #1321551
Add a local data collector

This collector will collect data from the local system, allowing image
builds or simple processes to influence the metadata.

implements bp tripleo-juno-occ-localdatasource

Change-Id: I0e58e8c631ffe8b63e8b4117df2c9ce2f413044f
Merge "Add a local data collector"
Updated from global requirements

Change-Id: I09953c528035bf4789313580c6e151b4638de898
Allow using non-default collectors

The local collector is not in DEFAULT_COLLECTORS, but should be usable
explicitly. It, however, suffers from a bug where only
DEFAULT_COLLECTORS are allowed through.

Change-Id: Ia42d1acd39638b448e2e2bfa26aff1c7ae415b71
Sync log from oslo

Update the copy of oslo's log to oslo-incubator
0533894d6bfacd82a371bccd628b61d5016032cd.

This is the first step towards supporting Python 3 in
os-collect-config.

Change-Id: If282091d7f0cbd4e2ce90d70c066bb11cbf56d38
Add support for Python 3

Make changes pretty much all over the code base with respect to
encoding strings and fixing imports to support Python 3.

Change-Id: Id1920129001b8e223474c1b2faf8bd9d527fe7e7
Merge "Sync log from oslo"
Merge "Add support for Python 3"
Using keystone discover to find V3 auth_url

This patch uses keystone client discover to find correct V3
auth_url which is expected by heat collector.

Change-Id: I2b8b5a768bdeb1cd1d20fab3b4234306c1429d6d
Closes-Bug: #1341936
Updated from global requirements

Change-Id: Iab28cdc166c480e7892c448a8e3a62a9d4d362eb
Merge "Using keystone discover to find V3 auth_url"
Remove pbr runtime dependency and replace with build time calculation

Requires some sed operation on REDHATOSCOLLECTCONFIGVERSION and
REDHATOSCOLLECTCONFIGRELEASE to runtime modify the package.
Merge branch 'master-patches' into f21-patches