diff options
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 964b8b67c..3d38e6853 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -10,8 +10,8 @@ RUN yum -y install \ MariaDB-shared \ openssl \ && yum clean all -{% endif %} +{% endif %} {% if install_type == 'binary' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} @@ -37,6 +37,39 @@ RUN yum -y install \ python-keystoneauth1 \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +# This will prevent questions from being asked during the install +ENV DEBIAN_FRONTEND noninteractive +COPY oslo-log-bug1499620.patch /var/lib/kolla/oslo-log-bug1499620.patch +# There is no python-tuskarclient in ubuntu 14.04 +RUN apt-get install -y --no-install-recommends \ + 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-zaqarclient \ + python-openstackclient \ + python-pymysql \ + python-keystoneclient \ + python-oslo.log \ + openssl \ + patch \ + && apt-get clean + +# python-oslo-log patch to bug 1499620 (it fixed in python-oslo-log 1.11.1) +RUN patch -d /usr/lib/python2.7/site-packages -p1 < /var/lib/kolla/oslo-log-bug1499620.patch + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} |