aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kolla/template/methods.py2
-rw-r--r--releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml10
2 files changed, 11 insertions, 1 deletions
diff --git a/kolla/template/methods.py b/kolla/template/methods.py
index 94d72401b..57a5e8330 100644
--- a/kolla/template/methods.py
+++ b/kolla/template/methods.py
@@ -49,7 +49,7 @@ def debian_package_install(packages, clean_package_cache=True):
# handle the apt-get install
if reg_packages:
- cmds.append('apt-get update')
+ cmds.append('apt-get --error-on=any update')
cmds.append('apt-get -y install --no-install-recommends {}'.format(
' '.join(reg_packages)
))
diff --git a/releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml b/releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml
new file mode 100644
index 000000000..395c8936b
--- /dev/null
+++ b/releasenotes/notes/apt-get-update-fatal-ed2bcc5c1d93c082.yaml
@@ -0,0 +1,10 @@
+---
+fixes:
+ - |
+ The ``apt-get update`` command by default didn't fail on erroneous source
+ repositories, it show the warning 'W: Some index files failed to download.
+ They have been ignored, or old ones used instead.' and continue to work.
+ This causes some containers (eg. rabbitmq, kolla-toolbox) successfully
+ built, but makes them inconsistent because the official Ubuntu repository
+ contains packages with the same names. Now we use ``apt-get -eany update``
+ command to stop building with an error in such cases.