diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-31 11:12:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-31 11:12:24 +0000 |
| commit | be230d47ebfa58ad430d6bad0c21b637776af88b (patch) | |
| tree | e232c3b034c2e4cc4fc04540950a5b9a8ddcb8f5 /docker/base | |
| parent | 3f5b6013038890f6ec13af37dc1e7b6301149968 (diff) | |
| parent | 5e521f0550cab5989580fe1a92c112d367f33072 (diff) | |
| download | kolla-be230d47ebfa58ad430d6bad0c21b637776af88b.tar.gz kolla-be230d47ebfa58ad430d6bad0c21b637776af88b.zip | |
Merge "Add Ansible support for Heat"
Diffstat (limited to 'docker/base')
| -rwxr-xr-x | docker/base/Dockerfile.j2 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3e8d6abdf..6213f2c70 100755 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -61,6 +61,7 @@ RUN yum install -y \ git \ iproute \ mariadb-libs \ + MySQL-python \ openssl \ openstack-utils \ pyparsing \ @@ -104,6 +105,7 @@ RUN yum install -y \ python-netifaces \ python-networkx \ python-oauthlib \ + python-openstackclient \ python-oslo-config \ python-oslo-messaging \ python-oslo-rootwrap \ @@ -155,7 +157,6 @@ RUN yum update -y \ libxslt-devel \ mariadb-devel \ mysql-devel \ - MySQL-python \ openldap-devel \ openssl \ openssl-devel \ @@ -193,7 +194,6 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD build-essential \ python-dev \ libssl-dev \ - python-mysqldb \ libmariadbclient-dev \ libxslt1-dev \ libffi-dev \ @@ -211,7 +211,11 @@ RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ - && rm get-pip.py + && rm get-pip.py \ + && pip --no-cache-dir install \ + python-openstackclient \ + MySQL-python \ + numpy # Endif for install_type source {% endif %} |