diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-10 12:22:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-10 12:22:18 +0000 |
| commit | e03558cc4113f9c3a376d4e64779f6c610f7519b (patch) | |
| tree | 820eecd11d4efbc9d84f8a46f45076070991df74 | |
| parent | 498c57fcac31da9268918ec6c188fe2aae0c4906 (diff) | |
| parent | 5859180c2c78c62defca37446722b5f15fdbefb7 (diff) | |
| download | kolla-e03558cc4113f9c3a376d4e64779f6c610f7519b.tar.gz kolla-e03558cc4113f9c3a376d4e64779f6c610f7519b.zip | |
Merge "Debian/Ubuntu: allow to use unsigned repositories"
| -rw-r--r-- | tests/templates/template_overrides.j2 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/templates/template_overrides.j2 b/tests/templates/template_overrides.j2 index e8aca54e7..f845f571e 100644 --- a/tests/templates/template_overrides.j2 +++ b/tests/templates/template_overrides.j2 @@ -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 %} |