From fbb1842fc8f9c4c418d37d305ea80b3c4130c31c Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 6 Oct 2015 11:42:52 -0700
Subject: [PATCH] Enable source for openstack-base for RPM distros

Make openstack-base optimized for from source builds for RPM based
distributions.

backport: liberty

Change-Id: I5f1056ebc09fd55cd5d46da7a09331e38940d888
Implements: blueprint openstack-common-container
---
 docker/base/Dockerfile.j2           | 22 +++-------------------
 docker/openstack-base/Dockerfile.j2 | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 28924b0d58..d45ce2753a 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -140,31 +140,15 @@ RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \
         {% endif %}
 
 # Update packages
-RUN yum update -y \
-    && yum install -y \
-        epel-release \
-        gcc \
-        gcc-c++ \
-        git \
-        libffi-devel \
-        libxml2-devel \
-        libxslt-devel \
-        mariadb-devel \
-        mysql-devel \
-        openldap-devel \
-        openssl \
-        openssl-devel \
-        postgresql \
-        postgresql-devel \
-        python-devel \
-        sqlite-devel \
+RUN yum -y install \
+        curl \
         sudo \
         tar \
         which \
     && yum clean all
 
+    # endif for install type is source for RPM based distros
     {% endif %}
-    # endif for install type is binary/rhos/rdo for RPM based distros
 # endif for base_distro centos,fedora,oraclelinux,rhel
 {% elif base_distro in ['ubuntu', 'debian'] %}
 
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 3e13505161..f730a2de40 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -38,8 +38,25 @@ RUN yum -y install \
 
     {% endif %}
 {% elif install_type == 'source' %}
+    {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
 
-    {% if base_distro in ['ubuntu', 'debian'] %}
+RUN yum -y install \
+        gcc \
+        gcc-c++ \
+        libffi-devel \
+        libxml2-devel \
+        libxslt-devel \
+        mariadb-devel \
+        mysql-devel \
+        openldap-devel \
+        openssl-devel \
+        postgresql \
+        postgresql-devel \
+        python-devel \
+        sqlite-devel \
+    && yum clean all
+
+    {% elif base_distro in ['ubuntu', 'debian'] %}
 
 RUN apt-get install -y --no-install-recommends \
         curl \