Merge "remove the build timeouts"
Merge "Ironic: Add deploy kernel and deploy ramdisk to driver_info"
Merge "[Fedora] Devstack fails to install in firewalld less system"
Reserve Keystone ports from the ephemeral range

Reserve Keystone ports from the ephemeral range as early as reasonably
possible in the fixup_stuff.sh process to reduce the likelihood that the
port will be in use. This does not completely resolve the issue
where Keystone's IANA assigned port falls into Linux's ephemeral
range, but this should reduce the occurrences. The default ports
are 35357 and 35358.

Change-Id: I8cfb53d8f90c1ff1fb1083c59fefabca3d14323b
Partial-Bug: #1253482
Merge "Use apache2ctl after apache is installed."
Merge "selinux permissive on Fedora"
Cut the heat flavor

1024Mb memory is too much for single instance.
approximately 4 GiB memory used even without a booted VM.

The heat auto-scaling scenario needs to boot 3 VM
(currently disabled), if any other test running in parallel
and boots up a vm it would easily can cause OOM an
issue.

The heat-slow job can work with 128 MiB instance memory,
but this change reduces it just to 512 MiB (safer for the guest),
and enough to avoid OOM issues on the host,
and let us to heve more vm at the same time.

The m1.tiny flavor is not good because now it has a hard coded
1 GiB disk limit and the f20 image requires 2 GiB.
Setting the disk size to '0' -> automatically use the virtual size
of the image.

Using multiple cores does not really helps in boot time :(,
but it might cause higher host load. (More locking)
Reducing the core number to 1.

Change-Id: Ice7c1253d15e91fd1c02bc8c6809335aaebfff4a
Merge "a more proper default nic selection criteria"
Merge "Install 'ipmitool' package for Ironic"
Merge "Remove unnecessary ini commenting from nova"
Merge "VMware NSX: fix typo"
Use identity_uri instead of auth fragments

auth_token middleware now accepts a standard URL string as the parameter
identity_uri instead of specifying protocol etc individually. Change the
services over to use this.

Also changes over some other places in which the auth fragments are used
individually to the new variables and fixes up some misconfigurations of
auth_token.

identity_uri option was release in keystoneclient 0.8.0

Change-Id: Iac13bc3d08c524a6a0f39cdfbc1009e2f5c45c2a
XenAPI: Fix deprecated config options

I346ee0248c03e60716bd7dc4a5ee4493610867cb broke the XenServer CI as
devstack was still setting the deprecated config options.

Change-Id: Icd84212e97a9d5e007745be8096fa552bc23cb6f
convert devstack from awk to outfilter

The complexity of the awk script was pretty high, and it would
be good to do it in summaries as well, which starts to get a bit
squirelly. Instead bring over the outfilter.py from grenade and
use it for the timestamping.

Any additional overhead from python should be offset from not
shelling out to date on every line of output.

Change-Id: Ic2b86ddba3e7f6520a0fd35599b01143936c6deb
Fix Apache Site configuration for openSUSE

We can use the mechnism as on Fedora for openSUSE.

Change-Id: Ic0d1734df3bdc9ec66e1592109b2d3770d6e0144
Merge "XenAPI: Fix deprecated config options"
double the screen sleep timeout

HP Cloud 1.1 is quite slow per core. So much so that grenade is
often failing to start services because bash in a screen session
isn't ready in 1.5s. Double this to 3s to try to decrease failures
in the gate.

We should instead do this via some readiness check to decrease
races.

Change-Id: I2b066a687916742e966190f00b5b06a795d4a014
Merge "convert devstack from awk to outfilter"
Invoke create_nova_conf_neutron from odl-compute post-install
only if nova is enabled.

Change-Id: I4627ab97eccd7fd4a2ffc31b6a0bb939b2343659
Add optional repo enablement for RHEL 7

The RHEL 7 and RHEL 6 optional repos have different names. This enables
the correct repo depending on the release.

Change-Id: I6772c9903a5b9e98cb870d586629564126a6119a