aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-18 05:04:01 +0000
committerGerrit Code Review <review@openstack.org>2017-12-18 05:04:01 +0000
commitf3ff6fb2f2a19354a44d943d9acd3999e84addd9 (patch)
tree712c1c9c31f3da329ca695eb34ee6e0da6ff9718
parent67da9078b95ab092e7f7474d2114dd63993fe925 (diff)
parent2e77b1dcf36dc63bbbae29c9931a84b637db9d65 (diff)
downloadkolla-f3ff6fb2f2a19354a44d943d9acd3999e84addd9.tar.gz
kolla-f3ff6fb2f2a19354a44d943d9acd3999e84addd9.zip
Merge "Revert "Fix deployment of ceph""
-rw-r--r--docker/base/apt_preferences.ubuntu23
1 files changed, 0 insertions, 23 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index 9c4ed5005..e69de29bb 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -1,23 +0,0 @@
-Package: ceph*
-Pin: version 10.*
-Pin-Priority: 550
-
-Package: *rbd*
-Pin: version 10.*
-Pin-Priority: 550
-
-Package: python-cephfs
-Pin: version 10.*
-Pin-Priority: 550
-
-Package: *rados*
-Pin: version 10.*
-Pin-Priority: 550
-
-Package: *rgw*
-Pin: version 10.*
-Pin-Priority: 550
-
-Package: qemu*
-Pin: version 1:2.5*
-Pin-Priority: 550