Adapt failing tests for latest wsme version

Some error message has been changed with the 0.6.1 wsme version due to
the fixed default value handling in wsme.

See 9c8a033415606667eca915c863165e5f9021bccb in wsme repo

Change-Id: I93b7138dcef1fb9e9b0d71661c8bc5a6344adb35
Closes-bug: #1315926
(cherry picked from commit 64697095e5f486c7fe7208410f2c4a18573a7dc0)
Disable specifying alarm itself in combination rule

Currently, update combination alarm can specify itself in alarm_ids,
however, that will cause endless loop when evaluating this alarm.

This patch adds a check to disable such behavior.

Change-Id: I63b465c59fe39206ae04b0736482d1ffd7bf59c4
Closes-Bug: #1304419
(cherry picked from commit de8176fa736ffa9c4d6b0a57a8db2f58083f124a)
Updated from global requirements

Change-Id: I3383fdbbdfa816fa7a0ffa1e5c87e4daee83d1ca
Sync kombu_reconnect_delay from Oslo

When reconnecting to a RabbitMQ cluster
with mirrored queues in use, the attempt to release the
connection can hang "indefinitely" somewhere deep down
in Kombu.  Blocking the thread for a bit prior to
release seems to kludge around the problem where it is
otherwise reproduceable.
The value 5.0 fits for low perfomance environments as well.

Cherry-picked from Oslo.messaging:
fcd51a67d18a9e947ae5f57eafa43ac756d1a5a8
Related-bug: #856764

Change-Id: Ifadda4dd9122df9ccb4ecf560ce3db3e38adf2b9
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
Fix network notifications of neutron bulk creation

When bulk creating ports, networks, subnets in neutron,
ceilometer-notification-agent will be broken and raise an KeyError.

Change-Id: Id5737f8ec8aa46561fe66bd56251d2a8d55f2548
Closes-Bug: #1317900
(cherry picked from commit bda44d592e02d95254d14819dbf5ffaeefa9f552)
Fix testing gate due to new keystoneclient release

As new keystoneclient version was released, token now
requires 'expires' field to be set.

Change-Id: I57a7746d24b82763824a02ac3d02049b055288c7
(cherry picked from commit 5a78832251e8cdf2dfbcc8b3a24ad8c4e7e3439c)
Merge "Disable specifying alarm itself in combination rule" into stable/icehouse
Merge "Updated from global requirements" into stable/icehouse
Merge "Sync kombu_reconnect_delay from Oslo" into stable/icehouse
Merge "Fix network notifications of neutron bulk creation" into stable/icehouse
Ensure routing key is specified in the address for a direct producer

This change is already merged in oslo-incubator.  Note that for
Ceilometer this is an Icehouse-specific patch since master has already
been updated to use the oslo.messaging library.

Original commit message body includes:

    Porting this fix from oslo.messaging.  This fixes the impl_qpid.py
    driver to allow it to work with the latest stable upstream QPID broker
    (version 0.28).  See the Apache Qpid Jira bug
    https://issues.apache.org/jira/browse/QPID-5557

Change-Id: If71f78e50f8a9b3acfd1e9d02c8271f17c4ebee7
Related-Bug: #1300318
Revert "Simplify the dispatcher method prototype"

This reverts commit fe1158de8ca5f70fa219da706d4960b864654be7.
Add an RPC collector dispatcher

To support cells, ceilometer collectors need to form a
heirarchy where messages are forwarded upwards to a collector
at the API level.

This implements the dispatcher interface using oslo.rpc.proxy.RpcProxy
for message forwarding to a given transport_url. Multiple dispatchers
are still supported, so a compute-level collector may still store
samples in its own database if desired.

Conflicts:
	etc/ceilometer/ceilometer.conf.sample
	setup.cfg
Spool metering messages to reduce mq connections