openstack/kolla
Code Issues Proposed changes

Merge "Revert "Seem there are some wrong in infra ubuntu repo""

Browse Source
This commit is contained in:
Zuul 2018-04-03 10:13:07 +00:00 committed by Gerrit Code Review
commit 6a3c5c58fe
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/templates/template_overrides.j2
View File

@ -63,11 +63,10 @@ RUN sed -i -e "/^mirrorlist/d" \
{% elif base_distro == "ubuntu" %}
{% endraw %}
# TODO(jeffrey4l): seem the current infra repo has some issue, revert this when it is OK.
#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 %}