Fix intermittent error in exercises/floating_ips.sh

Every once in a while I see this error running floating_ips.sh:

/devstack/exercises/floating_ips.sh:184:ping_check
/devstack/functions:356:_ping_check_neutron
/devstack/lib/neutron:904:die
[ERROR] /devstack/lib/neutron:904 [Fail] Could ping server

I think the problem is that it immediately tries to ping right
after the icmp rule is deleted.  Add a timeout and check so we
at least wait one second.

Change-Id: I753ec257fa12f6d2ddff1a5b1909e32d8995e173
Add heat_stack_owner role for heat trusts usage

Heat supports deferred operations via keystone trusts,
and we'd like to make that the default.  To do this, we
require a new role, which is the default role specified
in heat.conf trusts_delegated_roles, heat_stack_owner.

Add the role to the admin/demo users so they can create
heat stacks when we make deferred_auth_method=trusts the
default.

Change-Id: Idfc70ee89428c23f5965e643486ff2ad9566471c
Related-Bug: #1286157
Put tempest ipv6 option in the correct group

This commit updates the location for the ipv6 option to be in the
proper group. This depends on tempest change
I35769cf4d18363fad56ed5150b4d01d8a5ad17e7

Change-Id: Ief5ea00649c8954282245e30c63c45557a28ea9f
Close all logging file descriptors

This has lingered for a long time, finally do something about it...

Change-Id: Ib90408187698d5d4c23ffb0e527011446efc3c7e
Add support for sqlalchemy to Marconi

This patch adds a way to setup a marconi instance using sqlalchemy.

Change-Id: Ia694b76286835ca2ca935814370aa43544fe84fa
Add an ability to configure debug-level for ceilometer

Change-Id: Ibe9dd2391202a5af291d2eed1559bae60370f9a8
Fix errexit in lib/ldap

clear_ldap_state() deletes an object from the DIT that doesn't exist
on the first run, this is OK but fails with errexit enabled.

Change-Id: I3b881eedc891caa6b2dfd5913e43f3babcfa7d47
Make stop_swift() more robust for Grenade

stop_swift() wasn't calling screen_stop() so the pid files and screen
sessions were not being cleaned up.  DevStack doesn't really care but
Grenade does for the 'base' copy of DevStack.  This should be backported
to stable/havana for this reason.

Change-Id: Ib5afb321cef2b7ad74e69a3fd0d1dad469f78b11
Don't install vim or locate by default

Devstack doesn't need vim or locate, if someone wants to use them, they
can just install them afterwards.

Change-Id: I00f27c20c86d89465e4aefc67ed645a309c09a03
Merge "Fix errexit in lib/ldap"
Merge "Add support for sqlalchemy to Marconi"
Merge "Add an ability to configure debug-level for ceilometer"
Merge "Make stop_swift() more robust for Grenade"
Merge "Put tempest ipv6 option in the correct group"
Merge "Don't install vim or locate by default"
Merge "Fix intermittent error in exercises/floating_ips.sh"
Merge "Add heat_stack_owner role for heat trusts usage"
Merge "Close all logging file descriptors"
Merge branch 'master' of https://github.com/openstack-dev/devstack