aboutsummaryrefslogtreecommitdiff
path: root/docker/placement
diff options
context:
space:
mode:
Diffstat (limited to 'docker/placement')
-rw-r--r--docker/placement/placement-api/Dockerfile.j23
-rw-r--r--docker/placement/placement-base/Dockerfile.j22
2 files changed, 4 insertions, 1 deletions
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 %}