diff options
| author | Zuul <zuul@review.openstack.org> | 2019-04-12 08:09:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-04-12 08:09:11 +0000 |
| commit | 68b17a2bed7bf47a0fdc63c9e47354cc6c0300fa (patch) | |
| tree | 1645c61fecf865bf1c92bdf8d73c8e03793def34 /docker/placement | |
| parent | b7290b1f95647e410e6996d66333a7f0b6d467af (diff) | |
| parent | 6c0065185943355851308ae4df23b73918fab7be (diff) | |
| download | kolla-68b17a2bed7bf47a0fdc63c9e47354cc6c0300fa.tar.gz kolla-68b17a2bed7bf47a0fdc63c9e47354cc6c0300fa.zip | |
Merge "Fix ubuntu binary deploys"
Diffstat (limited to 'docker/placement')
| -rw-r--r-- | docker/placement/placement-api/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/placement/placement-base/Dockerfile.j2 | 2 |
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 %} |