Merge "Support rsyslog and RELP protocol"
diff --git a/files/glance-api.conf b/files/glance-api.conf
index bb758af..1bbd58e 100644
--- a/files/glance-api.conf
+++ b/files/glance-api.conf
@@ -155,7 +155,7 @@
paste.app_factory = glance.api.versions:app_factory
[app:apiv1app]
-paste.app_factory = glance.api.v1:app_factory
+paste.app_factory = glance.api.v1.router:app_factory
[filter:versionnegotiation]
paste.filter_factory = glance.api.middleware.version_negotiation:filter_factory
diff --git a/files/pips/openstack-integration-tests b/files/pips/tempest
similarity index 100%
rename from files/pips/openstack-integration-tests
rename to files/pips/tempest
diff --git a/stack.sh b/stack.sh
index 5fb8801..9d991f2 100755
--- a/stack.sh
+++ b/stack.sh
@@ -400,6 +400,10 @@
local service
for service in ${ENABLED_SERVICES//,/ }; do
+ # Allow individual services to specify dependencies
+ if [[ -e $FILES/apts/${service} ]]; then
+ file_to_parse="${file_to_parse} $service"
+ fi
if [[ $service == n-* ]]; then
if [[ ! $file_to_parse =~ nova ]]; then
file_to_parse="${file_to_parse} nova"
@@ -412,8 +416,6 @@
if [[ ! $file_to_parse =~ keystone ]]; then
file_to_parse="${file_to_parse} keystone"
fi
- elif [[ -e $FILES/apts/${service} ]]; then
- file_to_parse="${file_to_parse} $service"
fi
done
@@ -460,26 +462,35 @@
GIT_DEST=$2
GIT_BRANCH=$3
- # do a full clone only if the directory doesn't exist
- if [ ! -d $GIT_DEST ]; then
- git clone $GIT_REMOTE $GIT_DEST
- cd $2
- # This checkout syntax works for both branches and tags
- git checkout $GIT_BRANCH
- elif [[ "$RECLONE" == "yes" ]]; then
- # if it does exist then simulate what clone does if asked to RECLONE
+ if echo $GIT_BRANCH | egrep -q "^refs"; then
+ # If our branch name is a gerrit style refs/changes/...
+ if [ ! -d $GIT_DEST ]; then
+ git clone $GIT_REMOTE $GIT_DEST
+ fi
cd $GIT_DEST
- # set the url to pull from and fetch
- git remote set-url origin $GIT_REMOTE
- git fetch origin
- # remove the existing ignored files (like pyc) as they cause breakage
- # (due to the py files having older timestamps than our pyc, so python
- # thinks the pyc files are correct using them)
- find $GIT_DEST -name '*.pyc' -delete
- git checkout -f origin/$GIT_BRANCH
- # a local branch might not exist
- git branch -D $GIT_BRANCH || true
- git checkout -b $GIT_BRANCH
+ git fetch $GIT_REMOTE $GIT_BRANCH && git checkout FETCH_HEAD
+ else
+ # do a full clone only if the directory doesn't exist
+ if [ ! -d $GIT_DEST ]; then
+ git clone $GIT_REMOTE $GIT_DEST
+ cd $GIT_DEST
+ # This checkout syntax works for both branches and tags
+ git checkout $GIT_BRANCH
+ elif [[ "$RECLONE" == "yes" ]]; then
+ # if it does exist then simulate what clone does if asked to RECLONE
+ cd $GIT_DEST
+ # set the url to pull from and fetch
+ git remote set-url origin $GIT_REMOTE
+ git fetch origin
+ # remove the existing ignored files (like pyc) as they cause breakage
+ # (due to the py files having older timestamps than our pyc, so python
+ # thinks the pyc files are correct using them)
+ find $GIT_DEST -name '*.pyc' -delete
+ git checkout -f origin/$GIT_BRANCH
+ # a local branch might not exist
+ git branch -D $GIT_BRANCH || true
+ git checkout -b $GIT_BRANCH
+ fi
fi
}
@@ -724,6 +735,7 @@
# Virtualization Configuration
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ apt_get install libvirt-bin
# attempt to load modules: network block device - used to manage qcow images
sudo modprobe nbd || true
@@ -732,7 +744,6 @@
# kvm, we drop back to the slower emulation mode (qemu). Note: many systems
# come with hardware virtualization disabled in BIOS.
if [[ "$LIBVIRT_TYPE" == "kvm" ]]; then
- apt_get install libvirt-bin
sudo modprobe kvm || true
if [ ! -e /dev/kvm ]; then
echo "WARNING: Switching to QEMU"
@@ -744,15 +755,17 @@
# splitting a system into many smaller parts. LXC uses cgroups and chroot
# to simulate multiple systems.
if [[ "$LIBVIRT_TYPE" == "lxc" ]]; then
- apt_get install lxc
- # lxc uses cgroups (a kernel interface via virtual filesystem) configured
- # and mounted to ``/cgroup``
- sudo mkdir -p /cgroup
- if ! grep -q cgroup /etc/fstab; then
- echo none /cgroup cgroup cpuacct,memory,devices,cpu,freezer,blkio 0 0 | sudo tee -a /etc/fstab
- fi
- if ! mount -n | grep -q cgroup; then
- sudo mount /cgroup
+ if [[ "$DISTRO" > natty ]]; then
+ apt_get install cgroup-lite
+ else
+ cgline="none /cgroup cgroup cpuacct,memory,devices,cpu,freezer,blkio 0 0"
+ sudo mkdir -p /cgroup
+ if ! grep -q cgroup /etc/fstab; then
+ echo "$cgline" | sudo tee -a /etc/fstab
+ fi
+ if ! mount -n | grep -q cgroup; then
+ sudo mount /cgroup
+ fi
fi
fi
diff --git a/stackrc b/stackrc
index 7da7258..524cc99 100644
--- a/stackrc
+++ b/stackrc
@@ -40,7 +40,7 @@
QUANTUM_BRANCH=master
# CI test suite
-CITEST_REPO=https://github.com/openstack/openstack-integration-tests.git
+CITEST_REPO=https://github.com/openstack/tempest.git
CITEST_BRANCH=master
# Specify a comma-separated list of uec images to download and install into glance.
diff --git a/tools/build_ci_config.sh b/tools/build_ci_config.sh
index f627f43..0e43aa4 100755
--- a/tools/build_ci_config.sh
+++ b/tools/build_ci_config.sh
@@ -1,10 +1,10 @@
#!/usr/bin/env bash
#
-# build_ci_config.sh - Build a config.ini for openstack-integration-tests
-# (https://github.com/openstack/openstack-integration-tests)
+# build_ci_config.sh - Build a config.ini for tempest (openstack-integration-tests)
+# (https://github.com/openstack/tempest.git)
function usage {
- echo "$0 - Build config.ini for openstack-integration-tests"
+ echo "$0 - Build config.ini for tempest"
echo ""
echo "Usage: $0 [configdir]"
exit 1
@@ -49,7 +49,7 @@
# Where Openstack code lives
DEST=${DEST:-/opt/stack}
-CITEST_DIR=$DEST/openstack-integration-tests
+CITEST_DIR=$DEST/tempest
CONFIG_DIR=${1:-$CITEST_DIR/etc}
CONFIG_CONF=$CONFIG_DIR/storm.conf
@@ -90,7 +90,7 @@
}
# Install tests and prerequisites
-sudo PIP_DOWNLOAD_CACHE=/var/cache/pip pip install --use-mirrors `cat $TOP_DIR/files/pips/openstack-integration-tests`
+sudo PIP_DOWNLOAD_CACHE=/var/cache/pip pip install --use-mirrors `cat $TOP_DIR/files/pips/tempest`
git_clone $CITEST_REPO $CITEST_DIR $CITEST_BRANCH
diff --git a/tools/build_uec_ramdisk.sh b/tools/build_uec_ramdisk.sh
index 0c27734..3bd704b 100755
--- a/tools/build_uec_ramdisk.sh
+++ b/tools/build_uec_ramdisk.sh
@@ -149,7 +149,7 @@
git_clone $HORIZON_REPO $DEST/horizon $HORIZON_BRANCH
git_clone $NOVACLIENT_REPO $DEST/python-novaclient $NOVACLIENT_BRANCH
git_clone $OPENSTACKX_REPO $DEST/openstackx $OPENSTACKX_BRANCH
-git_clone $CITEST_REPO $DEST/openstack-integration-tests $CITEST_BRANCH
+git_clone $CITEST_REPO $DEST/tempest $CITEST_BRANCH
# Use this version of devstack
rm -rf $MNT_DIR/$DEST/devstack