diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-02 12:26:30 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-29 23:58:54 -0700 |
| commit | 5e521f0550cab5989580fe1a92c112d367f33072 (patch) | |
| tree | cfe655ebc71356bbeaccb74d6aa85cd89abee414 /docker/base | |
| parent | 730276aaf96cc6915b0fc4b2d08e366c7568338e (diff) | |
| download | kolla-5e521f0550cab5989580fe1a92c112d367f33072.tar.gz kolla-5e521f0550cab5989580fe1a92c112d367f33072.zip | |
Add Ansible support for Heat
This changes bootstrapping of the Heat container to bootstrap
the Heat container with a heat domain user. This requires some
work from bootstrap.yml to pass in several environment variables
needed by the heat domain setup script.
Co-Authored-By: Sam Yaple <sam@yaple.net>
Change-Id: Iab05983754fa514835cb5ff54d775faa18773110
Partially-implements: blueprint ansible-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 b3b0c776a..602555c85 100755 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -65,6 +65,7 @@ RUN yum install -y \ git \ iproute \ mariadb-libs \ + MySQL-python \ openssl \ openstack-utils \ pyparsing \ @@ -108,6 +109,7 @@ RUN yum install -y \ python-netifaces \ python-networkx \ python-oauthlib \ + python-openstackclient \ python-oslo-config \ python-oslo-messaging \ python-oslo-rootwrap \ @@ -173,7 +175,6 @@ RUN yum update -y \ libxslt-devel \ mariadb-devel \ mysql-devel \ - MySQL-python \ openldap-devel \ openssl \ openssl-devel \ @@ -210,7 +211,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 \ @@ -228,7 +228,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 %} |