From 0da25415f86c653597177a8f8c580b7f071f7cfc Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Sat, 19 Mar 2016 00:45:27 +0000
Subject: [PATCH] Increase usefulness of openstack-base

Just like last cycle, I ran all of the requirements and found the
packages that were installed >=10 times throughout our containers. By
combining them in the openstack-base we reduce the size of the images
by ~600MB (10%) and decrease build time by a measurable amount (5-10m
in the case of Centos)

TrivialFix
Change-Id: I582d75644a8e8b936c6f9fc10c6b5821e1e8c5c4
---
 docker/openstack-base/Dockerfile.j2 | 88 +++++++++++++++++++++++++++--
 1 file changed, 84 insertions(+), 4 deletions(-)

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 1869514873..1d8c287d0b 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -111,28 +111,108 @@ RUN ln -s openstack-base-source/* /requirements \
     && pip --no-cache-dir install -U virtualenv \
     && virtualenv --system-site-packages /var/lib/kolla/venv \
     && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \
+        Babel \
+        Mako \
+        MarkupSafe \
+        Paste \
+        PasteDeploy \
+        PyYAML \
+        Routes \
+        SQLAlchemy \
+        Tempita \
+        WebOb \
+        alembic \
+        amqp \
+        anyjson \
+        appdirs \
+        cachetools \
+        cliff \
+        cmd2 \
+        contextlib2 \
+        debtcollector \
+        decorator \
+        enum34 \
+        eventlet \
+        fasteners \
+        funcsigs \
+        functools32 \
+        futures \
+        futurist \
+        greenlet \
+        iso8601 \
         jinja2 \
+        jsonpatch \
+        jsonpointer \
+        jsonschema \
         kazoo \
+        keystoneauth1 \
         keystonemiddleware \
+        kombu \
+        monotonic \
+        msgpack-python \
+        netaddr \
+        netifaces \
+        os-client-config \
+        oslo.concurrency \
+        oslo.config \
+        oslo.context \
+        oslo.db \
+        oslo.i18n \
+        oslo.log \
+        oslo.messaging \
+        oslo.middleware \
+        oslo.policy \
+        oslo.serialization \
+        oslo.service \
+        oslo.utils \
+        pbr \
+        pika \
+        pika-pool \
+        positional \
+        prettytable \
+        pycadf \
+        pycrypto \
+        pyinotify \
+        pymysql \
+        pyparsing \
         python-barbicanclient \
         python-ceilometerclient \
+        python-cinderclient \
         python-congressclient \
+        python-dateutil \
         python-designateclient \
+        python-editor \
+        python-glanceclient \
         python-heatclient \
         python-ironicclient \
+        python-keystoneclient \
         python-magnumclient \
         python-manilaclient \
+        python-memcached \
         python-mistralclient \
         python-muranoclient \
+        python-neutronclient \
+        python-novaclient \
+        python-openstackclient \
         python-saharaclient \
         python-swiftclient \
         python-troveclient \
         python-tuskarclient \
         python-zaqarclient \
-        python-openstackclient \
-        pymysql \
-        python-memcached \
-        six
+        pytz \
+        repoze.lru \
+        requests \
+        requestsexceptions \
+        retrying \
+        simplejson \
+        six \
+        sqlalchemy-migrate \
+        sqlparse \
+        stevedore \
+        unicodecsv \
+        warlock \
+        wrapt
+
 ENV PATH /var/lib/kolla/venv/bin:$PATH
 
 {% endif %}