Merge "Wrong arguments for die() call"
blueprint devstack-support-for-keystone-mixbackend

Added KEYSTONE_ASSIGNMENT_BACKEND to support mixed backend

Modified code for KEYSTONE_IDENTITY_BACKEND according to comments.
Implemented the check for variables instead of case statements.
UPD: Removed arrays.
UPD2: fixed spacing issues
Change-Id: Ie92eed1fb5be5f875ef6633ede9c9e08daf6bf4f
Implements: devstack-support-for-keystone-mixbackend
import lib/oslo so we can clean it up

we were calling cleanup_oslo, however we weren't importing
lib/oslo, so that was just throwing an error message and moving on.

Let's stop doing that and actually clean up oslo.

Change-Id: I48340a8b3d5b50477fb5a7e2ce0bed27deb3ec01
Merge "Fix section on iniset for max_template_size"
Merge "import lib/oslo so we can clean it up"
Added Trove (Database as a Service).

- Added changes to stackrc for the Trove Repos.
- Added support to devstack for "install", "configure",
  "init", and "run"

implements blueprint:trove-devstack-integration

Change-Id: Ib3f6daad33e629f764a174b80762c808ce8588e2
remove whitebox configuration in tempest.conf

sync up with removing whitebox tests in tempest

This commit depends on https://review.openstack.org/#/c/46116/

Change-Id: I410583187284c2951d872f6e9465f741decc60bd
Merge "Added Trove (Database as a Service)."
Merge "Stop doing special things with setuptools"
Colorize Neutron log output and refactor log setup code

Bug 1214616

This patch adds colors to on-screen Neutron log output in the same way nova,
cinder, and heat engine do.
To this aim, colorized logging configuration has been moved to ./functions.
The reason for this refactoring is that these instruction are the same or
very similar for each project, with the only exception of the target
configuration file.

Change-Id: Idf0d1b842bb9ab046c9ef826de1dfc55b3f1df9d
Disable ceilometer.compute.nova_notifier driver

It appears that the ceilometer nova notification driver is causing
nova-compute to hang.  The last thing nova-compute logs before hanging
is a line from this driver.  At the very least the ceilometer nova
notification keeps stacktracing.

Change-Id: Ic375272b751159a64777ca73c1b64515195aacfb
Related-Bug: #1221987
Merge "Only run chmod/chown for local files"
Merge "Install schema-image.json"
lib/tempest remove whitebox section

tempest whitebox tests are removed from the tempest repo, so it's
configuration is unnecessary.

Change-Id: I6659e2af894014518a486f411ca06179d43bbb8b
Merge "blueprint devstack-support-for-keystone-mixbackend"
Merge "Disable ceilometer.compute.nova_notifier driver"
Merge "lib/tempest remove whitebox section"
use method pip_install over sudo pip install so proxy settings work

Change-Id: I2f0c69a72ef73c317b707d99c65cab0fb590d158
Allow replacing a user variable in a swift template

Prepare for a change in swift templates that will have a %USER%
variable.

Change-Id: I611ae7f82de7f2e6a38ce3de38d0600fa8687bff
Partial-Bug: 1226346
Remove change_apache_user_group function

This function allowed you to change the process running user for all of
apache. This is better handled on a per-process basis.

Change-Id: I165adc0c49fc328f34835856b49983c4e189f143
Fixes: bug 1226346
Fixes: bug 1225853