From 571c5bc87881c5326ca02e0e9472c6c15ed390fa Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 29 Sep 2015 03:38:51 -0700
Subject: Make a openstack-common container for CentOS variants

Only implements CentOS (RPM family) binary in openstack-common.

Change-Id: I5249d0ffaf4c0c946ee2347d5519391ded160cea
Partially Implments: blueprint openstack-common-container
---
 docker/openstack-base/Dockerfile.j2 | 38 ++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

(limited to 'docker/openstack-base')

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 6a0604595..3e1350516 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -1,13 +1,45 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-{% if install_type == 'source' %}
+{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+RUN yum -y install \
+        git \
+        iproute \
+        mariadb-libs \
+        MySQL-python \
+        openssl \
+        patch \
+    && yum clean all
+{% endif %}
+
+{% if install_type == 'binary' %}
     {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
 
-RUN yum -y install patch \
+RUN yum -y install \
+        python-barbicanclient \
+        python-ceilometerclient \
+        python-congressclient \
+        python-designateclient \
+        python-heatclient \
+        python-ironicclient \
+        python-magnumclient \
+        python-manilaclient \
+        python-mistralclient \
+        python-muranoclient \
+        python-pip \
+        python-saharaclient \
+        python-swiftclient \
+        python-troveclient \
+        python-tuskarclient \
+        python-zaqarclient \
+        python-openstackclient \
+        MySQL-python \
     && yum clean all
 
-    {% elif base_distro in ['ubuntu', 'debian'] %}
+    {% endif %}
+{% elif install_type == 'source' %}
+
+    {% if base_distro in ['ubuntu', 'debian'] %}
 
 RUN apt-get install -y --no-install-recommends \
         curl \
-- 
cgit v1.2.3