From eb24764e73d7d7f00848e0784785430c110633fa Mon Sep 17 00:00:00 2001
From: Jon Schlueter <jschluet@redhat.com>
Date: Wed, 25 Apr 2018 01:02:44 -0400
Subject: Collapse down multiple yum install in openstack-base

For rhel/centos/oraclelinux there were 2 yum install
sections, collapse/folded the 3 packages from that section
into the other blocks in sorted order

Change-Id: I8a3d212314891635509aeeb346998ace713feefa
---
 docker/openstack-base/Dockerfile.j2 | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'docker/openstack-base/Dockerfile.j2')

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index b8b09ef89..f47bd60c7 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -5,16 +5,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-    {% set openstack_base_packages = [
-        'git',
-        'iproute',
-        'openssl'
-    ] %}
-
-{{ macros.install_packages(openstack_base_packages) }}
-
-{% endif %}
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
 
@@ -26,7 +16,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'fontconfig',
             'fontpackages-filesystem',
             'freetype',
+            'git',
             'initscripts',
+            'iproute',
             'libjpeg-turbo',
             'libpng',
             'libX11',
@@ -38,6 +30,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'libxslt',
             'libyaml',
             'MySQL-python',
+            'openssl',
             'pyOpenSSL',
             'pyparsing',
             'python-crypto',
@@ -215,12 +208,15 @@ ENV DEBIAN_FRONTEND noninteractive
         {% set openstack_base_packages = [
             'gcc',
             'gcc-c++',
+            'git',
+            'iproute',
             'libffi-devel',
             'libxml2-devel',
             'libxslt-devel',
             'libyaml-devel',
             'mariadb-devel',
             'openldap-devel',
+            'openssl',
             'openssl-devel',
             'postgresql',
             'postgresql-devel',
-- 
cgit v1.2.3