diff options
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/nova/nova-placement-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | tests/templates/template_overrides.j2 | 4 |
7 files changed, 11 insertions, 11 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 = [ diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index f69ed479c..cda759521 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -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 %} 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' ] %} diff --git a/lower-constraints.txt b/lower-constraints.txt index 455b58116..6b47a50e9 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -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 diff --git a/requirements.txt b/requirements.txt index f201b5b68..f6e403133 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index 7574dbd87..e8aca54e7 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -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 %} |