aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-01-15 21:33:09 +0000
committerGerrit Code Review <review@openstack.org>2020-01-15 21:33:09 +0000
commit21af8d86f3e6629ab3d53e9547c2f0868dfc339d (patch)
tree161bfa8812840c1558ec96a862b5a1f8b5762c39
parentbe8dd0affd7a1728e8a5c072e375b854b63b6b5d (diff)
parentf253bc2380c2c9c82f86136b266dc351c100bf02 (diff)
downloadkolla-21af8d86f3e6629ab3d53e9547c2f0868dfc339d.tar.gz
kolla-21af8d86f3e6629ab3d53e9547c2f0868dfc339d.zip
Merge "Debian: enable backports repo"
-rw-r--r--docker/base/apt_preferences.debian4
-rw-r--r--docker/base/sources.list.debian3
-rw-r--r--releasenotes/notes/debian-ceph-nautilus-83fe26e66874045f.yaml4
3 files changed, 11 insertions, 0 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index e69de29bb..887f67782 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -0,0 +1,4 @@
+# We want Ceph/nautilus
+Package: ceph* libceph* librados* librbd* librgw* python3-ceph* python3-rados python3-rbd python3-rgw radosgw
+Pin: version 14.*
+Pin-Priority: 1000
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index 561f19d02..0f88b7cdb 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -4,6 +4,9 @@ deb http://deb.debian.org/debian buster main
# debian security updates
deb http://security.debian.org/debian-security buster/updates main
+# debian backports
+deb http://deb.debian.org/debian buster-backports main
+
# Buster - Train repos
deb http://buster-train.debian.net/debian buster-train-backports main
deb http://buster-train.debian.net/debian buster-train-backports-nochange main
diff --git a/releasenotes/notes/debian-ceph-nautilus-83fe26e66874045f.yaml b/releasenotes/notes/debian-ceph-nautilus-83fe26e66874045f.yaml
new file mode 100644
index 000000000..fb578af6f
--- /dev/null
+++ b/releasenotes/notes/debian-ceph-nautilus-83fe26e66874045f.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ Debian images are using Ceph 14 'nautilus' like other distributions.