From 43d2a0b78fb5506a868d3baab1f6bf7c16c0ab91 Mon Sep 17 00:00:00 2001
From: Shaun Smekel <shaun.smekel@theorem.net.au>
Date: Fri, 12 Aug 2016 07:01:29 +1000
Subject: [PATCH] Customizations for Tempest
This patchset contains customization of Dockerfile of the Tempest
container.
Change-Id: I32751bdd400978336d29e3a1c5c758d33316edfa
Partially-implements: blueprint third-party-plugin-support
---
docker/tempest/Dockerfile.j2 | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2
index 8b389116dd..0e1f5edc18 100644
--- a/docker/tempest/Dockerfile.j2
+++ b/docker/tempest/Dockerfile.j2
@@ -1,20 +1,17 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% import "macros.j2" as macros with context %}
+
{% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
- openstack-tempest \
- && yum clean all
-
+ {% set tempest_packages = ['openstack-tempest'] %}
{% elif base_distro in ['ubuntu'] %}
+ {% set tempest_packages = ['tempest'] %}
+ {% endif %}
-RUN apt-get -y install --no-install-recommends \
- tempest \
- && apt-get clean
+RUN {{ macros.install_packages(tempest_packages | customizable("packages")) }}
- {% endif %}
{% elif install_type == 'source' %}
ADD tempest-archive /tempest-source
@@ -32,4 +29,6 @@ WORKDIR /tempest
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start
+{% block tempest_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
--
GitLab