openstack/kolla
Code Issues Proposed changes

Fix lower-constraints and kolla CI jobs

Browse Source 
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
This commit is contained in:
Mark Goddard 2019-03-14 11:58:52 +00:00 committed by Marcin Juszkiewicz
parent c8bbd0b102
commit cdcd5610e9
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/base/Dockerfile.j2
View File

@ -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 = [

2
docker/horizon/Dockerfile.j2
View File

@ -84,7 +84,7 @@ RUN echo > /etc/apache2/ports.conf \
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
&& rm /etc/apache2/conf-enabled/openstack-dashboard.conf \
&& for locale in /usr/lib/python{{distro_python_version}}/site-packages/*/locale; do \
(cd ${locale%/*} && /usr/bin/python /usr/bin/manage.py compilemessages) \
(cd ${locale%/*} && /usr/bin/python3 /usr/bin/manage.py compilemessages) \
done
{% endblock %}

5
docker/nova/nova-libvirt/Dockerfile.j2
View File

@ -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" %}

2
docker/nova/nova-placement-api/Dockerfile.j2
View File

@ -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'
] %}

2
lower-constraints.txt
View File

@ -81,7 +81,7 @@ PyYAML==3.10
requests==2.18.4
requestsexceptions==1.4.0
rfc3986==1.2.0
setuptools==16.0
setuptools==21.0
simplejson==3.13.2
six==1.10.0
smmap2==2.0.3

2
requirements.txt
View File

@ -9,5 +9,5 @@ GitPython>=1.0.1 # BSD License (3 clause)
six>=1.10.0 # MIT
oslo.config>=5.1.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=16.0 # PSF/ZPL
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=21.0 # PSF/ZPL
netaddr>=0.7.18 # BSD

4
tests/templates/template_overrides.j2
View File

@ -26,8 +26,8 @@ RUN sed -i -e "/^mirrorlist/d" \
{% elif base_distro == 'oraclelinux' %}
{% endraw %}
RUN sed -i -e "s|^baseurl=http://yum.oracle.com/repo/OracleLinux|baseurl={{ nodepool_oraclelinux_proxy }}|" \
/etc/yum.repos.d/public-yum-ol7.repo
RUN sed -i -e "s|^baseurl=https://yum$ociregion.oracle.com/repo/OracleLinux|baseurl={{ nodepool_oraclelinux_proxy }}|" \
/etc/yum.repos.d/oracle-linux-ol7.repo
{% raw %}
{% endif %}