Merge "Ceph hammer update" into R2.22-dev

Juniper · Sep 18, 2015 · a23c731 · a23c731
2 parents 81b242e + 7dcf9d2
commit a23c731
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 59 deletions.
diff --git a/build/package_configs/ubuntu1204/icehouse/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1204/icehouse/depends_contrail_dependent_packages.cfg
@@ -820,12 +820,12 @@ file           = librabbitmq1_0.4.1-1~cloud0_amd64.deb
 md5            = 6df124d855bc5f51cba437762c07aa69
 
 [librados2_0.87.2-1]
-file           = librados2_0.87.2-1_amd64.deb
-md5            = 79960c9be25951ee9c8bcf10b2c48864
+file           = librados2_0.94.3-1_amd64.deb
+md5            = 89d42aad247f8257b28d35eb5c7886d9
 
 [librbd1_0.87.2-1]
-file           = librbd1_0.87.2-1_amd64.deb
-md5            = 408d1689c0c557bf06660be86e50682e
+file           = librbd1_0.94.3-1_amd64.deb
+md5            = 6879a9573d11a0137ad3150a3da7f5a2
 
 [libsctp1_1.0.11+dfsg-2]
 file           = libsctp1_1.0.11+dfsg-2_amd64.deb

diff --git a/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg b/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg
@@ -17,32 +17,52 @@ location     =
 package_type = contrail-storage-packages
 
 [ceph-mds]
-file  = ceph-mds_0.87.2-1_amd64.deb
-md5   = 722752dd23a93a6154ef35687a5487fd
+file  = ceph-mds_0.94.3-1_amd64.deb
+md5   = 62bfac808f2d4a4eabaf2ee4d42e9595
 
 [libcephfs1]
-file  = libcephfs1_0.87.2-1_amd64.deb
-md5   = a1c458253ad6fa420c1dfe3fbb99f1b9
+file  = libcephfs1_0.94.3-1_amd64.deb
+md5   = 88a90ecb38e34b71f268757938948157
 
 [ceph-fs-common]
-file  = ceph-fs-common_0.87.2-1_amd64.deb
-md5   = 60501505cf6d739e006bfa55da49bdd4
+file  = ceph-fs-common_0.94.3-1_amd64.deb
+md5   = fe53b6fa63e5ebcf35bf9a2140f38f6a
 
 [ceph]
-file  = ceph_0.87.2-1_amd64.deb
-md5   = bcfd49082e621cc77bc2f6a847fd79a8
+file  = ceph_0.94.3-1_amd64.deb
+md5   = 00d283d724832ab96d216e1d2dd4ca77
 
 [ceph-fuse]
-file  = ceph-fuse_0.87.2-1_amd64.deb
-md5   = 60aa813007d55f34a461b1062c6c2c64
+file  = ceph-fuse_0.94.3-1_amd64.deb
+md5   = b7c4cbb4b75fa5d078cafc61d2d4c2dc
 
 [ceph-common]
-file  = ceph-common_0.87.2-1_amd64.deb
-md5   = 695ab87e5b95df962765cb4b16b8317e
+file  = ceph-common_0.94.3-1_amd64.deb
+md5   = f447b3205fdc807310f604aa49340a31
 
 [python-ceph]
-file  = python-ceph_0.87.2-1_amd64.deb
-md5   = 84024577f36f9bd5b4246b58b57ca889
+file  = python-ceph_0.94.3-1_amd64.deb
+md5   = 40716a9c614069697122a8ead590c7b6
+
+[python-cephfs]
+file  = python-cephfs_0.94.3-1_amd64.deb
+md5   = 0e777d2011ad6b787b6d511c23bb61da
+
+[python-rados]
+file  = python-rados_0.94.3-1_amd64.deb
+md5   = 4d73acd3b8f5367e68da0c46be3018cf
+
+[python-rbd]
+file  = python-rbd_0.94.3-1_amd64.deb
+md5   = e6a7ee1229687435ae04a048a178af15
+
+[libsysfs2]
+file  = libsysfs2_2.1.0+repack-1_amd64.deb
+md5   = babff14a9a65aef0acf4337103862c1e
+
+[sysfsutils]
+file  = sysfsutils_2.1.0+repack-1_amd64.deb
+md5   = 46f71261e0a40cb9a6be63cf7efdd7b8
 
 [libgssglue1]
 file  = libgssglue1_0.3-4ubuntu0.1_amd64.deb

diff --git a/build/package_configs/ubuntu1404/icehouse/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_contrail_dependent_packages.cfg
@@ -711,13 +711,13 @@ md5            = 59f733e1342ff743039cec1d6305fc2c
 file           = libcrypto++9_5.6.1-6_amd64.deb
 md5            = be261df24d1f96cbef9fbc9c832c4f33
 
-[librados2_0.87.2-1]
-file           = librados2_0.87.2-1_amd64.deb
-md5            = 64edb9970d7dd94e5b14fbd05c5f1cfb
+[librados2]
+file           = librados2_0.94.3-1_amd64.deb
+md5            = 1fda56fcea87883eac43cfe64a053cc8
 
-[librbd1_0.87.2-1]
-file           = librbd1_0.87.2-1_amd64.deb
-md5            = af3cd4feb3b8dc6ed5d54d00eca93762
+[librbd1]
+file           = librbd1_0.94.3-1_amd64.deb
+md5            = e8c19b5c926566e1dee19f17d82f7fbd
 
 [libsctp1_1.0.15+dfsg-1]
 file           = libsctp1_1.0.15+dfsg-1_amd64.deb

diff --git a/build/package_configs/ubuntu1404/icehouse/depends_storage_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_storage_packages.cfg
@@ -17,32 +17,44 @@ location     =
 package_type = contrail-storage-packages
 
 [libcephfs1]
-file  = libcephfs1_0.87.2-1_amd64.deb
-md5   = 1c0530be5a968b15ef0154967e6d28f7
+file  = libcephfs1_0.94.3-1_amd64.deb
+md5   = d84b8d5bff0fbc28a409a86a7404a1f1
 
 [ceph]
-file  = ceph_0.87.2-1_amd64.deb
-md5   = 834d15a55d38053ac0616347a8b890ad
+file  = ceph_0.94.3-1_amd64.deb
+md5   = 21d49b08f0a58a47bf538bff432bbd08
 
 [ceph-common]
-file  = ceph-common_0.87.2-1_amd64.deb
-md5   = a015581736861d6fa043b244f942989b
+file  = ceph-common_0.94.3-1_amd64.deb
+md5   = 78c6b1148c33613ae94950a85ade46a0
 
 [python-ceph]
-file  = python-ceph_0.87.2-1_amd64.deb
-md5   = 706df3e3ecda0f7eb6aa196753c87c53
+file  = python-ceph_0.94.3-1_amd64.deb
+md5   = 5545203abde322fe2276ab7411b55671
+
+[python-cephfs]
+file  = python-cephfs_0.94.3-1_amd64.deb
+md5   = 792cf110e076e0d24517d2ad368fe7a2
+
+[python-rados]
+file  = python-rados_0.94.3-1_amd64.deb
+md5   = 00bea7c2466b129cd8c2860ab8b45501
+
+[python-rbd]
+file  = python-rbd_0.94.3-1_amd64.deb
+md5   = 8e73f62212b2506723bfea96beb750fd
 
 [ceph-mds]
-file  = ceph-mds_0.87.2-1_amd64.deb
-md5   = 9be76d2c16c27bb550a7aa9e9c417d48
+file  = ceph-mds_0.94.3-1_amd64.deb
+md5   = 4b8f4c4290784505e9e376cb3cf5f38f
 
 [ceph-fuse]
-file  = ceph-fuse_0.87.2-1_amd64.deb
-md5   = ad9ddbb6c378350bca29f079406ccb12
+file  = ceph-fuse_0.94.3-1_amd64.deb
+md5   = 5af677c2e4982aafb868aac61b7ee0af
 
 [ceph-fs-common]
-file  = ceph-fs-common_0.87.2-1_amd64.deb
-md5   = ebade33218c3d8770e765c846c3f39bd
+file  = ceph-fs-common_0.94.3-1_amd64.deb
+md5   = 3b84230b622feca1cc315ee49eca972a
 
 [libgssglue1]
 file  = libgssglue1_0.3-4ubuntu0.1_amd64.deb
@@ -267,3 +279,39 @@ md5   = 676483e59b2785704d298800fb893595
 [libgc1c2]
 file  = libgc1c2_7.2d-5ubuntu2_amd64.deb
 md5   = 77b7d6c1e799ff3f449999f48c62193b
+
+[libjemalloc-dev]
+file  = libjemalloc-dev_3.5.1-2_amd64.deb
+md5   = 7995c3bac6ca04c5642ea10a131cc157
+
+[libjemalloc1]
+file  = libjemalloc1_3.5.1-2_amd64.deb
+md5   = 00605dfc92f2fe7d961e543704cfb7c4
+
+[libnspr4-0d]
+file  = libnspr4-0d_2%%3a4.10.7-0ubuntu0.14.04.1_amd64.deb
+md5   = 4e849c7636781e78e1d6784fca7e0ff3
+
+[libnspr4]
+file  = libnspr4_2%%3a4.10.7-0ubuntu0.14.04.1_amd64.deb
+md5   = 11d1647e5b8b13194fa9d3cac67268c5
+
+[libnss3-1d]
+file  = libnss3-1d_2%%3a3.17.4-0ubuntu0.14.04.1_amd64.deb
+md5   = d29ca37115bb8ab0b7ccfa4471836a16
+
+[libnss3-nssdb]
+file  = libnss3-nssdb_2%%3a3.17.4-0ubuntu0.14.04.1_all.deb
+md5   = 14321501ff31df6942801199f394d678
+
+[libnss3]
+file  = libnss3_2%%3a3.17.4-0ubuntu0.14.04.1_amd64.deb
+md5   = 387fdd6e1b2af3cc20936d997f87cc1a
+
+[libsysfs2]
+file  = libsysfs2_2.1.0+repack-3ubuntu1_amd64.deb
+md5   = 366df7440d6e399c2c775cf81fa508b5
+
+[sysfsutils]
+file  = sysfsutils_2.1.0+repack-3ubuntu1_amd64.deb
+md5   = 641ba8cee477cdcf99f3e6b13cbd7c3d
diff --git a/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_contrail_dependent_packages.cfg
@@ -851,13 +851,13 @@ md5            = 59f733e1342ff743039cec1d6305fc2c
 file           = libcrypto++9_5.6.1-6_amd64.deb
 md5            = be261df24d1f96cbef9fbc9c832c4f33
 
-[librados2_0.87.2-1]
-file           = librados2_0.87.2-1_amd64.deb
-md5            = 64edb9970d7dd94e5b14fbd05c5f1cfb
+[librados2]
+file           = librados2_0.94.3-1_amd64.deb
+md5            = 1fda56fcea87883eac43cfe64a053cc8
 
-[librbd1_0.87.2-1]
-file           = librbd1_0.87.2-1_amd64.deb
-md5            = af3cd4feb3b8dc6ed5d54d00eca93762
+[librbd1]
+file           = librbd1_0.94.3-1_amd64.deb
+md5            = e8c19b5c926566e1dee19f17d82f7fbd
 
 [libroken18-heimdal_1.6~git20131207+dfsg-1ubuntu1.1]
 file           = libroken18-heimdal_1.6~git20131207+dfsg-1ubuntu1.1_amd64.deb

diff --git a/build/package_configs/ubuntu1404/juno/depends_storage_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_storage_packages.cfg
@@ -17,32 +17,44 @@ location     =
 package_type = contrail-storage-packages
 
 [libcephfs1]
-file  = libcephfs1_0.87.2-1_amd64.deb
-md5   = 1c0530be5a968b15ef0154967e6d28f7
+file  = libcephfs1_0.94.3-1_amd64.deb
+md5   = d84b8d5bff0fbc28a409a86a7404a1f1
 
 [ceph]
-file  = ceph_0.87.2-1_amd64.deb
-md5   = 834d15a55d38053ac0616347a8b890ad
+file  = ceph_0.94.3-1_amd64.deb
+md5   = 21d49b08f0a58a47bf538bff432bbd08
 
 [ceph-common]
-file  = ceph-common_0.87.2-1_amd64.deb
-md5   = a015581736861d6fa043b244f942989b
+file  = ceph-common_0.94.3-1_amd64.deb
+md5   = 78c6b1148c33613ae94950a85ade46a0
 
 [python-ceph]
-file  = python-ceph_0.87.2-1_amd64.deb
-md5   = 706df3e3ecda0f7eb6aa196753c87c53
+file  = python-ceph_0.94.3-1_amd64.deb
+md5   = 5545203abde322fe2276ab7411b55671
+
+[python-cephfs]
+file  = python-cephfs_0.94.3-1_amd64.deb
+md5   = 792cf110e076e0d24517d2ad368fe7a2
+
+[python-rados]
+file  = python-rados_0.94.3-1_amd64.deb
+md5   = 00bea7c2466b129cd8c2860ab8b45501
+
+[python-rbd]
+file  = python-rbd_0.94.3-1_amd64.deb
+md5   = 8e73f62212b2506723bfea96beb750fd
 
 [ceph-mds]
-file  = ceph-mds_0.87.2-1_amd64.deb
-md5   = 9be76d2c16c27bb550a7aa9e9c417d48
+file  = ceph-mds_0.94.3-1_amd64.deb
+md5   = 4b8f4c4290784505e9e376cb3cf5f38f
 
 [ceph-fuse]
-file  = ceph-fuse_0.87.2-1_amd64.deb
-md5   = ad9ddbb6c378350bca29f079406ccb12
+file  = ceph-fuse_0.94.3-1_amd64.deb
+md5   = 5af677c2e4982aafb868aac61b7ee0af
 
 [ceph-fs-common]
-file  = ceph-fs-common_0.87.2-1_amd64.deb
-md5   = ebade33218c3d8770e765c846c3f39bd
+file  = ceph-fs-common_0.94.3-1_amd64.deb
+md5   = 3b84230b622feca1cc315ee49eca972a
 
 [libgssglue1]
 file  = libgssglue1_0.3-4ubuntu0.1_amd64.deb
@@ -276,3 +288,38 @@ md5   = 60bb4a95db770d3bacc69df04fc6e080
 file  = libaugeas0_1.2.0-0ubuntu1.1_amd64.deb
 md5   = bed4213162bca8af578fb8b9b1f34c9f
 
+[libjemalloc-dev]
+file  = libjemalloc-dev_3.5.1-2_amd64.deb
+md5   = 7995c3bac6ca04c5642ea10a131cc157
+
+[libjemalloc1]
+file  = libjemalloc1_3.5.1-2_amd64.deb
+md5   = 00605dfc92f2fe7d961e543704cfb7c4
+
+[libnspr4-0d]
+file  = libnspr4-0d_2%%3a4.10.7-0ubuntu0.14.04.1_amd64.deb
+md5   = 4e849c7636781e78e1d6784fca7e0ff3
+
+[libnspr4]
+file  = libnspr4_2%%3a4.10.7-0ubuntu0.14.04.1_amd64.deb
+md5   = 11d1647e5b8b13194fa9d3cac67268c5
+
+[libnss3-1d]
+file  = libnss3-1d_2%%3a3.17.4-0ubuntu0.14.04.1_amd64.deb
+md5   = d29ca37115bb8ab0b7ccfa4471836a16
+
+[libnss3-nssdb]
+file  = libnss3-nssdb_2%%3a3.17.4-0ubuntu0.14.04.1_all.deb
+md5   = 14321501ff31df6942801199f394d678
+
+[libnss3]
+file  = libnss3_2%%3a3.17.4-0ubuntu0.14.04.1_amd64.deb
+md5   = 387fdd6e1b2af3cc20936d997f87cc1a
+
+[libsysfs2]
+file  = libsysfs2_2.1.0+repack-3ubuntu1_amd64.deb
+md5   = 366df7440d6e399c2c775cf81fa508b5
+
+[sysfsutils]
+file  = sysfsutils_2.1.0+repack-3ubuntu1_amd64.deb
+md5   = 641ba8cee477cdcf99f3e6b13cbd7c3d
diff --git a/storage/debian/contrail-storage/debian/control b/storage/debian/contrail-storage/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
 Package: contrail-storage
 Architecture: all
 Maintainer: jjeya <jjeya@juniper.net>
-Depends: ceph (>= 0.87), ceph-deploy, libvirt-bin, libaio1, python-cinderclient, cinder-volume, libsensors4, sysstat, nfs-common, smartmontools, sas2ircu
+Depends: ceph (>= 0.87), ceph-deploy, libvirt-bin, libaio1, python-cinderclient, cinder-volume, libsensors4, sysstat, nfs-common, smartmontools, sas2ircu, sysfsutils
 Section: contrail-openstack-storage
 Priority: extra
 Description: Contrail storage package