From f98bd052719a92daf89eda0cd4dd9709d1e7e2be Mon Sep 17 00:00:00 2001
From: Paul Bourke <pauldbourke@gmail.com>
Date: Fri, 23 Oct 2015 16:06:01 +0100
Subject: [PATCH] Add new image for tempest

Note, this image is slightly different to most others in Kolla in that
it's not a service designed to be deployed via Ansible. It's more a
'tool' type image that is spun up when needed.

Partially-Implements: blueprint tempest-gate

Change-Id: I1877c03d0804e57d274044aecb1055f847025bec
---
 docker/tempest/Dockerfile.j2 | 21 +++++++++++++++++++++
 etc/kolla/kolla-build.conf   |  4 ++++
 2 files changed, 25 insertions(+)
 create mode 100644 docker/tempest/Dockerfile.j2

diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2
new file mode 100644
index 0000000000..f8330f217d
--- /dev/null
+++ b/docker/tempest/Dockerfile.j2
@@ -0,0 +1,21 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+        openstack-tempest \
+    && yum clean all
+
+    {% endif %}
+{% elif install_type == 'source' %}
+
+ADD tempest-archive /tempest-source
+RUN ln -s tempest-source/* tempest \
+    && pip --no-cache-dir install -c requirements/upper-constraints.txt /tempest \
+    && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock
+
+{% endif %}
+
+{{ include_footer }}
diff --git a/etc/kolla/kolla-build.conf b/etc/kolla/kolla-build.conf
index 6368924f3a..baaa29ff96 100644
--- a/etc/kolla/kolla-build.conf
+++ b/etc/kolla/kolla-build.conf
@@ -142,6 +142,10 @@ location = http://github.com/kanaka/noVNC/tarball/v0.5.1
 type = url
 location = http://tarballs.openstack.org/swift/swift-master.tar.gz
 
+[tempest]
+type = url
+location = http://tarballs.openstack.org/tempest/tempest-master.tar.gz
+
 [zaqar]
 type = url
 location = http://tarballs.openstack.org/zaqar/zaqar-master.tar.gz