Merge "Fix vm_test_mode"
Merge "Disable fallocate and set max_file_size to default"
Remove notify_on_any_change

This option has been removed from Nova.

Change-Id: Ic1369cc05861686daae36ec8e5f96b687cac728c
Update neutron-vpn-agent path

Fix path of vpn-agent as same as lbaas

- If q-vpn service is enabled, this patch switches the l3-agent to
vpn-agent

Change-Id: Ifbe3d51b5c89f759a71e904960c5f6cc99c44a5f
Configure tempauth along keystoneauth.

- This would help testing the two auth server for functional testing.
- Fixes bug 1202233.

Change-Id: Ie0bc642873585ab02083aed543720b4a9b17cb02
Merge "Only create swift account if swift enabled"
fix name of scheduler_driver in produced nova.conf

Fixes bug #1202174.  The nova.conf config variable that configures which
scheduler to use is scheduler_driver, not compute_scheduler_driver.

Change-Id: I775cae40edc9f8f55177f9d95cdbaa9416c4bfcd
Add mysql support for ceilometer storage backend in devstack

Currently, devstack only support mongodb as ceilometer storage backend,
this patch is to add mysql storage support for ceilometer.
If you want to use mysql as backend during developing, you can specify
CEILOMETER_BACKEND=mysql in localrc file.
If you use mongodb, just ignore the parameter.

Change-Id: Ic2f475a9baa6d71a43cd29a6ca777ac972e47b0a
Implements: blueprint ceilometer-mysql-support
Create an endpoint for nova api v3.

Supports both SQL and templated keystone backend.
Create an additional endpoint for nova api v3.
The service type is computev3.
The endpoint is similar to the v2 one but the version
part is "v3" rather than "v2", and it does not include
the tenantid anymore.

Fixes: bug #1191798
Change-Id: I86e4734c3a9e57f1dc68f1104449d7c041d6927d
Merge "Remove notify_on_any_change"
Merge "Configure tempauth along keystoneauth."
Merge "UUID Token provider in keystone.conf"
Merge "fix name of scheduler_driver in produced nova.conf"
Merge "Create an endpoint for nova api v3."
Use unique build dir for pip installs

There is a bug in pip [1] where it will choose to install a package
from an existing build-dir if it exists over the version actually
requested.

Thus if a prior component has installed a later version of the
package, the unpacked code is already in /tmp/$USER-pip-build; it gets
re-installed and manifests in a confusing error along the lines of

---
 Downloading/unpacking requests>=1.1,<1.2.3
   (from -r /home/stack//python-cinderclient/requirements.txt (line 5))
   Running setup.py egg_info for package requests
   Requested requests>=1.1,<1.2.3 (from -r
   /home/stack/python-cinderclient/requirements.txt (line 5)),
    but installing version 1.2.3
...
  error: Installed distribution requests 1.2.3 conflicts with
    requirement requests>=1.1,<1.2.3
---

I believe pip 1.4 fixes this problem, but it should always be safe to
specify a unique build-directory for pip installs to avoid picking up
old versions.

We also add a cleanup_tmp function for clearing out anything that
stack.sh might leave around when un-stacking, and add a catch-all for
the pip-build dir.

[1] https://github.com/pypa/pip/issues/709

Change-Id: I7ce919cddfd6d6175ae67bd864f82e256ebc7090
Merge "Add mysql support for ceilometer storage backend in devstack"
Merge "Update neutron-vpn-agent path"
Set external_network_bridge for the test configuration file

Fixes bug #1203210
Supports blueprint nvp-third-party-support

Change-Id: I21d769b552d31fe099f2773c919e0c7b471399fc
Merge "make rejoin-stack.sh keep the same service tags"
Merge "Set external_network_bridge for the test configuration file"