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/base | |
| 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/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 0c34c30a0..46c4a8d79 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -337,7 +337,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences ] %} {% if base_distro == 'ubuntu' %} - {# 05CE15085FC09D18E99EFB22684A14CF2582E0C5 -- InfluxDB Packaging Service <support@influxdb.com> #} {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #} {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #} {# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key <https://launchpad.net/~odl-team> #} @@ -347,7 +346,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #} {# A20F259AEB9C94BB -- Sensuapp (Freight) <support@hw-ops.com> #} {% set base_apt_keys = [ - '05CE15085FC09D18E99EFB22684A14CF2582E0C5', '391A9AA2147192839E9DB0315EDB1B62EC4926EA', '46095ACC8548582C1A2699A9D27D666CD88E42B4', '49B07274951063870A8B7EAE7B8AA1A344C05248', @@ -359,7 +357,8 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences ] %} {% set remote_apt_keys = [ 'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey', - 'https://packages.grafana.com/gpg.key' + 'https://packages.grafana.com/gpg.key', + 'https://repos.influxdata.com/influxdb.key' ] %} {% elif base_distro == 'debian' %} {% set base_apt_keys = [ |