diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-03-14 11:58:52 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-03-15 12:01:25 +0100 |
| commit | cdcd5610e95a8188d3e66f93e098838fe91a5a97 (patch) | |
| tree | ae0569af9d7b5d670f70668a78e82f73330383be /docker/nova | |
| parent | c8bbd0b102e176170ae707b310c47f490660cf83 (diff) | |
| download | kolla-cdcd5610e95a8188d3e66f93e098838fe91a5a97.tar.gz kolla-cdcd5610e95a8188d3e66f93e098838fe91a5a97.zip | |
Fix lower-constraints and kolla CI jobs
Multiple fixes to fix multiple problems.
1. Bump setuptools requirement to 21.0.0
The 16.0.0 requirement breaks the lower-constraints job on Ubuntu
bionic. We see the following error:
AttributeError: module 'importlib._bootstrap' has no attribute 'SourceFileLoader'
2. ubuntu-binary horizon image needs to use python3 for django
manage.py
3. ubuntu-binary nova-placement-api image needs to use python3 for
apache mod wsgi.
4. nova-libvirt needs exact qemu dependencies due to packaging change
5. OracleLinux repos definition was changed in official image.
6. Fetch InfluxDB gpg key for Ubuntu base image from influx server.
Change-Id: Ic797d41f53a5f146d112619f1683cbfbf3a85dc2
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/nova/nova-placement-api/Dockerfile.j2 | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index be503849e..a8311e418 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -39,8 +39,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libvirt-daemon-system', 'openvswitch-switch', 'pm-utils', - 'qemu', - 'qemu-block-extra' + 'qemu-block-extra', + 'qemu-kvm', + 'qemu-system-x86' ] %} {% if base_arch == "aarch64" %} diff --git a/docker/nova/nova-placement-api/Dockerfile.j2 b/docker/nova/nova-placement-api/Dockerfile.j2 index 5c37e0a23..0f66d2eb5 100644 --- a/docker/nova/nova-placement-api/Dockerfile.j2 +++ b/docker/nova/nova-placement-api/Dockerfile.j2 @@ -27,7 +27,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set nova_placement_api_packages = [ 'apache2', - 'libapache2-mod-wsgi', + 'libapache2-mod-wsgi-py3', 'nova-placement-api' ] %} |