openstack
/
kolla
Code Issues Proposed changes

Debian/Ubuntu: allow to use unsigned repositories 

When we run Debian 'buster' or Ubuntu 18.04 in CI job they refuse to
work as infra mirror is not signed.

This patch instructs APT to use unsigned repos anyway.

Change-Id: I530fde5b57894afda2de98d7c217e735497e3feb
This commit is contained in:
Marcin Juszkiewicz 2019-06-07 12:53:51 +02:00
parent 9cfd3a88aa
commit 5859180c2c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/templates/template_overrides.j2
View File

@ -14,7 +14,10 @@ RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \
{% raw %}
{% if base_distro == 'ubuntu' %}
RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow-unauthenticated
# NOTE(hrw): Debian 'buster' and Ubuntu 18.04 refuse to use unsigned repos
RUN echo 'APT::Get::AllowUnauthenticated "true";' > /etc/apt/apt.conf.d/99allow-unauthenticated \
&& echo 'Acquire::AllowInsecureRepositories "true";' > /etc/apt/apt.conf.d/99allow-insecure-repos
{% elif base_distro == 'centos' %}
{% endraw %}
@ -69,11 +72,10 @@ RUN sed -i -e "/^mirrorlist/d" \
{% elif base_distro == "ubuntu" %}
{% endraw %}
# FIXME(jeffrey4l): seems we can not use unsigned repo in ubuntu 18.04
#RUN sed -i -e "s|http://archive.ubuntu.com|http://{{ nodepool_mirror_host }}|" \
# -e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \
# /etc/apt/sources.list \
# && apt-get update
RUN sed -i -e "s|http://archive.ubuntu.com|http://{{ nodepool_mirror_host }}|" \
-e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \
/etc/apt/sources.list \
&& apt-get update
{% raw %}
{% endif %}