From 6c0065185943355851308ae4df23b73918fab7be Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 9 Apr 2019 17:43:54 +0100 Subject: Fix ubuntu binary deploys 1. Install python3-pymysql in placement-base image. 2. Remove default placement WSGI config. 3. Use python3 for manage.py in horizon Change-Id: Ibb620af2241e39fe99bc48757f90296c0d77d438 Partial-Bug: #1823989 --- docker/placement/placement-api/Dockerfile.j2 | 3 ++- docker/placement/placement-base/Dockerfile.j2 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'docker/placement') diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2 index 468428453..b18d7e1e3 100644 --- a/docker/placement/placement-api/Dockerfile.j2 +++ b/docker/placement/placement-api/Dockerfile.j2 @@ -32,7 +32,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ ] %} {{ macros.install_packages(placement_api_packages | customizable("packages")) }} -RUN truncate -s 0 /etc/apache2/ports.conf +RUN truncate -s 0 /etc/apache2/ports.conf \ + && rm -f /etc/apache2/sites-enabled/placement-api.conf {% endif %} {% elif install_type == 'source' %} diff --git a/docker/placement/placement-base/Dockerfile.j2 b/docker/placement/placement-base/Dockerfile.j2 index 30e4a76f0..6c82e7e28 100644 --- a/docker/placement/placement-base/Dockerfile.j2 +++ b/docker/placement/placement-base/Dockerfile.j2 @@ -17,9 +17,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} + # TODO(mgoddard): Remove python3-pymysql when in openstack-base. {% set placement_base_packages = [ 'mariadb-client', 'placement-common', + 'python3-pymysql', ] %} {% endif %} -- cgit v1.2.3