From c3d343fe182cbd081d68eb81f4889ba4d302ff97 Mon Sep 17 00:00:00 2001
From: okozachenko <okozachenko@vexxhost.com>
Date: Wed, 22 Jul 2020 00:03:57 +0300
Subject: [PATCH] Switch heat image builds

Change-Id: I80bd8c975426dbb1ddfc98d191b93195f4a21a67
---
 images/heat/Dockerfile       | 17 +++--------------
 images/heat/constraints.txt  |  1 +
 images/heat/requirements.txt |  4 ++++
 3 files changed, 8 insertions(+), 14 deletions(-)
 create mode 100644 images/heat/constraints.txt
 create mode 100644 images/heat/requirements.txt

diff --git a/images/heat/Dockerfile b/images/heat/Dockerfile
index ff68b56a..bd299130 100644
--- a/images/heat/Dockerfile
+++ b/images/heat/Dockerfile
@@ -12,17 +12,8 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-FROM docker.io/opendevorg/python-builder as builder
-COPY bindep.txt /tmp/src/bindep.txt
-ADD https://releases.openstack.org/constraints/upper/ussuri /tmp/src/upper-constraints.txt
-RUN assemble openstack-heat==14.0.0 \
-    python-memcached \
-    PyMySQL
-
-FROM docker.io/opendevorg/uwsgi-base AS heat-api-base
-COPY --from=builder /output/ /output
-RUN /output/install-from-bindep
+FROM vexxhost/python-builder AS builder
+FROM vexxhost/python-base AS heat-api-base
 
 FROM heat-api-base AS heat-api
 EXPOSE 8004
@@ -34,8 +25,6 @@ EXPOSE 8000
 ENV UWSGI_HTTP_SOCKET=:8000 UWSGI_WSGI_FILE=/usr/local/bin/heat-wsgi-api-cfn
 CMD ["/usr/local/bin/uwsgi","--ini","/etc/uwsgi/uwsgi.ini"]
 
-FROM docker.io/opendevorg/python-base AS heat-engine
-COPY --from=builder /output/ /output
-RUN /output/install-from-bindep
+FROM heat-api-base AS heat-engine
 RUN ln -s /usr/local/etc/heat /etc/heat
 CMD ["/usr/local/bin/heat-engine"]
diff --git a/images/heat/constraints.txt b/images/heat/constraints.txt
new file mode 100644
index 00000000..3317a098
--- /dev/null
+++ b/images/heat/constraints.txt
@@ -0,0 +1 @@
+--constraint https://releases.openstack.org/constraints/upper/ussuri
\ No newline at end of file
diff --git a/images/heat/requirements.txt b/images/heat/requirements.txt
new file mode 100644
index 00000000..3ae58f8d
--- /dev/null
+++ b/images/heat/requirements.txt
@@ -0,0 +1,4 @@
+uWSGI
+python-memcached
+PyMySQL
+git+https://opendev.org/openstack/heat@stable/ussuri
\ No newline at end of file