Merge "Add support for Fedora 20"
Robustify service shutdown

* Save PID when using screen in screen_it()
* Add screen_stop()
* Call out service stop_*() in unstack.sh functions so screen_stop()
  can do its thing

Closes-bug: 1183449
Change-Id: Iac84231cfda960c4197de5b6e8ba6eb19225169a
clean up ubuntu versions

oneiric is long dead, remove references to it whenever possible
(one more subtle issue in cinder should be a seperate patch). This
includes removing the oneiric only tool build_uec.sh.

also remove the bulk of references to quantal, which is 8 months
out of support. note: raring only has support for the rest of the
month.

Change-Id: Ib17502be7572af76dc95560615221b48b970a547
Merge "Use --tenant-id, not --tenant_id"
Merge "Add a flexible API version choice for Cinder, Glance and Heat"
Merge "Put cinder rootwrap config in separate function"
Skip Nova exercises if Nova is not enabled

This allows for ./exercises.sh to complete sucessfully when nova is not
enabled / installed.

Change-Id: If969e14f5106c15007146e8fad1da27d131828c8
Merge "Correct Qpid package name in files/apts/neutron"
Merge "Robustify service shutdown"
Merge "Configuration changes required to support VMware NSX plugin"
Merge "clean up ubuntu versions"
Add Marconi to Tempest config

This patch adds queuing to tempest config, provided queuing is
available in devstack.

Change-Id: I2925a07d312c1f8ab2fe465f74f0bef9299eef40
Implements: blueprint add-basic-marconi-tests
Merge "Setup Keystone catalog information for Ceilometer"
Merge "Fix Heat/Cloud formation catalog template"
Merge "Enable server-side and client-side logs for libvirt"
Merge "gitignore: add .localrc.auto and local.conf"
Merge "Remove duplicated name services"
Updates for tools/info.sh

* Handle local.conf localrc section
* remove blank lines
* rather than removing password lines, just remove the password itself to at
  least show which password vars have been set

Change-Id: Ieca9baaf03e53b23e336944ad0ed2581c9bee460
Merge "Add Marconi to Tempest config"
Fix duplicated rootwrap.d in lib/ironic

The Ironic setup of devstack is duplicating the rootwrap.d directory at
/etc/ironic/rootwrap.d/rootwrap.d, this will cause the ironic-rootwrap
command to fail to execute. This patch is removing the duplicated
rootwrap.d directory.

Change-Id: I24844c24620b5b33ad1a6acd0d872e9df11d6d89
Closes-Bug: #1268930