From 5e521f0550cab5989580fe1a92c112d367f33072 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sun, 2 Aug 2015 12:26:30 -0700 Subject: 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 Change-Id: Iab05983754fa514835cb5ff54d775faa18773110 Partially-implements: blueprint ansible-heat --- docker/base/Dockerfile.j2 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'docker/base') 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 %} -- cgit v1.2.3