Merge "Storage package update" into R3.1

Juniper · Dec 17, 2016 · 204a91d · 204a91d
2 parents 5366d18 + 62fce58
commit 204a91d
Show file tree

Hide file tree

Showing 5 changed files with 222 additions and 252 deletions.
diff --git a/build/package_configs/ubuntu1404/juno/depends_storage_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_storage_packages.cfg
@@ -132,29 +132,29 @@ file           = libmailutils4_1%%3a2.99.98-1.1_amd64.deb
 md5            = a6755462a0efb1c3f9217d9a10c459e0
 source         = repo:trusty
 
-[storage-libnspr4-0d_2:4.10.10-0ubuntu0.14.04.1]
-file           = libnspr4-0d_2%%3a4.10.10-0ubuntu0.14.04.1_amd64.deb
-md5            = 7a77d9d7e6625c36c80b36b1017f6845
+[storage-libnspr4-0d_2:4.12-0ubuntu0.14.04.1]
+file           = libnspr4-0d_2%%3a4.12-0ubuntu0.14.04.1_amd64.deb
+md5            = 95d161ab098588452a90d9cf5be8d7e7
 source         = repo:trusty-updates
 
-[storage-libnspr4_2:4.10.10-0ubuntu0.14.04.1]
-file           = libnspr4_2%%3a4.10.10-0ubuntu0.14.04.1_amd64.deb
-md5            = bfb262e77ef709dfaa5ae037630e49ff
+[storage-libnspr4_2:4.12-0ubuntu0.14.04.1]
+file           = libnspr4_2%%3a4.12-0ubuntu0.14.04.1_amd64.deb
+md5            = cff22f4863f0e8356900e6b26872a63c
 source         = repo:trusty-updates
 
-[storage-libnss3-1d_2:3.21-0ubuntu0.14.04.2]
-file           = libnss3-1d_2%%3a3.21-0ubuntu0.14.04.2_amd64.deb
-md5            = fb956169ec9dd0cb7d6dd36a49b84ab6
+[storage-libnss3-1d_2:3.23-0ubuntu0.14.04.1]
+file           = libnss3-1d_2%%3a3.23-0ubuntu0.14.04.1_amd64.deb
+md5            = 96170b238bc6a8ccc48418d28dce8285
 source         = repo:trusty-updates
 
-[storage-libnss3-nssdb_2:3.21-0ubuntu0.14.04.2]
-file           = libnss3-nssdb_2%%3a3.21-0ubuntu0.14.04.2_all.deb
-md5            = a72742a1b68774875bde367e984b6a68
+[storage-libnss3-nssdb_2:3.23-0ubuntu0.14.04.1]
+file           = libnss3-nssdb_2%%3a3.23-0ubuntu0.14.04.1_all.deb
+md5            = 7b4064d8bb5f8ca3f0aec63699666564
 source         = repo:trusty-updates
 
-[storage-libnss3_2:3.21-0ubuntu0.14.04.2]
-file           = libnss3_2%%3a3.21-0ubuntu0.14.04.2_amd64.deb
-md5            = 267e9467a90bb2077eb9984bee3b1c5f
+[storage-libnss3_2:3.23-0ubuntu0.14.04.1]
+file           = libnss3_2%%3a3.23-0ubuntu0.14.04.1_amd64.deb
+md5            = 915f9fd9b0b0d18bbfe66f47774daec8
 source         = repo:trusty-updates
 
 [storage-libntlm0_1.4-1]
@@ -282,9 +282,9 @@ file           = sysstat_10.2.0-1_amd64.deb
 md5            = c85d3d8c3d3162c4d6b2efe1b963e0d2
 source         = repo:trusty
 
-[storage-tgt_1:1.0.43-0ubuntu4.1~14.04.2]
-file           = tgt_1%%3a1.0.43-0ubuntu4.1~14.04.2_amd64.deb
-md5            = 3fee716804c6dd4452b40d3084e67696
+[storage-tgt_1:1.0.43-0ubuntu4.1~14.04.3]
+file           = tgt_1%%3a1.0.43-0ubuntu4.1~14.04.3_amd64.deb
+md5            = e662be318b3244b46bf8ab360add5b2e
 source         = repo:trusty-updates
 
 [storage-watershed_7]

diff --git a/build/package_configs/ubuntu1404/kilo/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/kilo/depends_contrail_thirdparty_packages.cfg
@@ -254,96 +254,6 @@ file           = dpdk-depends-packages_14.04-kilo1_amd64.deb
 md5            = 22f8a984c9deec669a078bab78abd3a8 
 package_type   = contrail-install-packages, contrail-dependent-packages
 
-[storage-ceph-common_0.94.6-1contrail3]
-file           = ceph-common_0.94.6-1contrail3_amd64.deb
-md5            = a5d7c6b059fb3e8dd9d35de2621855ed
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-ceph-fs-common_0.94.6-1contrail3]
-file           = ceph-fs-common_0.94.6-1contrail3_amd64.deb
-md5            = 5ac1571d444a5de5f1aa8b01e65b1c8c
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-ceph-fuse_0.94.6-1contrail3]
-file           = ceph-fuse_0.94.6-1contrail3_amd64.deb
-md5            = 958389b6bbfec13ace9667ef4daea968
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-ceph-mds_0.94.6-1contrail3]
-file           = ceph-mds_0.94.6-1contrail3_amd64.deb
-md5            = a365eebb366919e646203d6c9c4a5d48
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-ceph_0.94.6-1contrail3]
-file           = ceph_0.94.6-1contrail3_amd64.deb
-md5            = b45a7365dbb0d3c743c337dc2a855ebc
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-libcephfs1_0.94.6-1contrail3]
-file           = libcephfs1_0.94.6-1contrail3_amd64.deb
-md5            = 397f6f342ed65fff4c288fca281b13ac
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-librados2_0.94.6-1contrail3]
-file           = librados2_0.94.6-1contrail3_amd64.deb
-md5            = 66427b13fd41cd647bf3e4df4595998b
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-libradosstriper1_0.94.6-1contrail3]
-file           = libradosstriper1_0.94.6-1contrail3_amd64.deb
-md5            = 0d239000f08dd8dd7e0d7b93b4c33880
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-librbd1_0.94.6-1contrail3]
-file           = librbd1_0.94.6-1contrail3_amd64.deb
-md5            = 0f10fb265f48a3e9c9e39031c80c46bb
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-python-ceph_0.94.6-1contrail3]
-file           = python-ceph_0.94.6-1contrail3_amd64.deb
-md5            = 7c92195f063b16dff1911febb92ef0de
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-python-cephfs_0.94.6-1contrail3]
-file           = python-cephfs_0.94.6-1contrail3_amd64.deb
-md5            = d7182c036ca478072ee08e098bd6b9f5
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-python-rados_0.94.6-1contrail3]
-file           = python-rados_0.94.6-1contrail3_amd64.deb
-md5            = 461df36e99270e5929b46e654e28bd34
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-python-rbd_0.94.6-1contrail3]
-file           = python-rbd_0.94.6-1contrail3_amd64.deb
-md5            = 2d21b0da941a4aec377ee46f0e840acc
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-radosgw_0.94.6-1contrail3]
-file           = radosgw_0.94.6-1contrail3_amd64.deb
-md5            = a7c135a7344e998bb2a812d538dcc237
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
-[storage-rbd-fuse_0.94.6-1contrail3]
-file           = rbd-fuse_0.94.6-1contrail3_amd64.deb
-md5            = f9a0d817a1b99c3dcc51250080cfd510
-source         = repo:contrail-thirdparty
-package_type   = contrail-storage-packages
-
 [storage-sas2ircu_16.00.00.00-1contrail1]
 file           = sas2ircu_16.00.00.00-1contrail1_amd64.deb
 md5            = 1e8d0288700a0e416231b88f2fd35674

diff --git a/build/package_configs/ubuntu1404/kilo/depends_storage_packages.cfg b/build/package_configs/ubuntu1404/kilo/depends_storage_packages.cfg
@@ -32,19 +32,44 @@ file           = btrfs-tools_3.12-1ubuntu0.1_amd64.deb
 md5            = 4a47a743970471e37b9b6e59419bf4c5
 source         = repo:trusty-updates
 
+[storage-ceph-common_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = ceph-common_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = 429df04db2faea9aabed577e6a01f9b7
+source         = repo:trusty-updates-kilo
+
 [storage-ceph-deploy_1.4.0-0ubuntu1]
 file           = ceph-deploy_1.4.0-0ubuntu1_all.deb
 md5            = 106ff343c0df2c8e7d0245d0482269ab
 source         = repo:trusty
 
-[storage-cinder-backup_1:2015.1.3-0ubuntu1]
-file           = cinder-backup_1%%3a2015.1.3-0ubuntu1_all.deb
-md5            = ac0e2fd36ad1d8f474d0fb44faa7540c
+[storage-ceph-fs-common_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = ceph-fs-common_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = cf644c48e2a9045946229bf54f91add9
+source         = repo:trusty-updates-kilo
+
+[storage-ceph-fuse_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = ceph-fuse_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = e7aa7f997b606a69af30e6bb14523f51
+source         = repo:trusty-updates-kilo
+
+[storage-ceph-mds_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = ceph-mds_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = e158bcc49b6ec34417d9b283d9802b56
+source         = repo:trusty-updates-kilo
+
+[storage-ceph_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = ceph_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = 60a687563960e836b34e39634a7a1b84
 source         = repo:trusty-updates-kilo
 
-[storage-cinder-volume_1:2015.1.3-0ubuntu1]
-file           = cinder-volume_1%%3a2015.1.3-0ubuntu1_all.deb
-md5            = a457d891a2cd4d971b0f3dc840c494a3
+[storage-cinder-backup_1:2015.1.4-0ubuntu1]
+file           = cinder-backup_1%%3a2015.1.4-0ubuntu1_all.deb
+md5            = 00ed3127123b53ad28ce7a00ec615d18
+source         = repo:trusty-updates-kilo
+
+[storage-cinder-volume_1:2015.1.4-0ubuntu1]
+file           = cinder-volume_1%%3a2015.1.4-0ubuntu1_all.deb
+md5            = d16f06f43c4aa369425010fccf7e6750
 source         = repo:trusty-updates-kilo
 
 [storage-cryptsetup-bin_2:1.6.1-1ubuntu1]
@@ -72,6 +97,11 @@ file           = heirloom-mailx_12.5-2+deb7u1build0.14.04.1_amd64.deb
 md5            = 9e8badc74dfbfe379e3520f343ac93a0
 source         = repo:trusty-updates
 
+[storage-libcephfs1_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = libcephfs1_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = 68a4e2bdfffe3915afa4fd3d6ed5b64d
+source         = repo:trusty-updates-kilo
+
 [storage-libconfig-general-perl_2.52-1]
 file           = libconfig-general-perl_2.52-1_all.deb
 md5            = 42dd64a2e8c1dd19c1f0efd52da3af41
@@ -137,36 +167,51 @@ file           = libmailutils4_1%%3a2.99.98-1.1_amd64.deb
 md5            = a6755462a0efb1c3f9217d9a10c459e0
 source         = repo:trusty
 
-[storage-libnspr4-0d_2:4.10.10-0ubuntu0.14.04.1]
-file           = libnspr4-0d_2%%3a4.10.10-0ubuntu0.14.04.1_amd64.deb
-md5            = 7a77d9d7e6625c36c80b36b1017f6845
+[storage-libnspr4-0d_2:4.12-0ubuntu0.14.04.1]
+file           = libnspr4-0d_2%%3a4.12-0ubuntu0.14.04.1_amd64.deb
+md5            = 95d161ab098588452a90d9cf5be8d7e7
 source         = repo:trusty-updates
 
-[storage-libnspr4_2:4.10.10-0ubuntu0.14.04.1]
-file           = libnspr4_2%%3a4.10.10-0ubuntu0.14.04.1_amd64.deb
-md5            = bfb262e77ef709dfaa5ae037630e49ff
+[storage-libnspr4_2:4.12-0ubuntu0.14.04.1]
+file           = libnspr4_2%%3a4.12-0ubuntu0.14.04.1_amd64.deb
+md5            = cff22f4863f0e8356900e6b26872a63c
 source         = repo:trusty-updates
 
-[storage-libnss3-1d_2:3.21-0ubuntu0.14.04.2]
-file           = libnss3-1d_2%%3a3.21-0ubuntu0.14.04.2_amd64.deb
-md5            = fb956169ec9dd0cb7d6dd36a49b84ab6
+[storage-libnss3-1d_2:3.23-0ubuntu0.14.04.1]
+file           = libnss3-1d_2%%3a3.23-0ubuntu0.14.04.1_amd64.deb
+md5            = 96170b238bc6a8ccc48418d28dce8285
 source         = repo:trusty-updates
 
-[storage-libnss3-nssdb_2:3.21-0ubuntu0.14.04.2]
-file           = libnss3-nssdb_2%%3a3.21-0ubuntu0.14.04.2_all.deb
-md5            = a72742a1b68774875bde367e984b6a68
+[storage-libnss3-nssdb_2:3.23-0ubuntu0.14.04.1]
+file           = libnss3-nssdb_2%%3a3.23-0ubuntu0.14.04.1_all.deb
+md5            = 7b4064d8bb5f8ca3f0aec63699666564
 source         = repo:trusty-updates
 
-[storage-libnss3_2:3.21-0ubuntu0.14.04.2]
-file           = libnss3_2%%3a3.21-0ubuntu0.14.04.2_amd64.deb
-md5            = 267e9467a90bb2077eb9984bee3b1c5f
+[storage-libnss3_2:3.23-0ubuntu0.14.04.1]
+file           = libnss3_2%%3a3.23-0ubuntu0.14.04.1_amd64.deb
+md5            = 915f9fd9b0b0d18bbfe66f47774daec8
 source         = repo:trusty-updates
 
 [storage-libntlm0_1.4-1]
 file           = libntlm0_1.4-1_amd64.deb
 md5            = 494a0ba5d16fe739b2ca575e7177604a
 source         = repo:trusty
 
+[storage-librados2_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = librados2_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = 5c6f3b2a603c3fc2868f3ab450cae84d
+source         = repo:trusty-updates-kilo
+
+[storage-libradosstriper1_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = libradosstriper1_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = 30195161421f2a459ef990fbb4289300
+source         = repo:trusty-updates-kilo
+
+[storage-librbd1_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = librbd1_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = 1a9d4f091d5000443aa3efadca09dd61
+source         = repo:trusty-updates-kilo
+
 [storage-librdmacm1_1.0.16-1]
 file           = librdmacm1_1.0.16-1_amd64.deb
 md5            = e48ede8d81ea578c585655eef431b858
@@ -227,6 +272,16 @@ file           = python-blinker_1.3.dfsg1-1ubuntu2_all.deb
 md5            = 1084d75f917fed1cd00fe11edd5695e6
 source         = repo:trusty
 
+[storage-python-ceph_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = python-ceph_0.94.8-0ubuntu0.15.04.1~cloud0_all.deb
+md5            = 70d41d8d1dacaa2fa6de186a56107972
+source         = repo:trusty-updates-kilo
+
+[storage-python-cephfs_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = python-cephfs_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = ca733e54566fa5c875cf09e567dd5a51
+source         = repo:trusty-updates-kilo
+
 [storage-python-flask_0.10.1-2build1]
 file           = python-flask_0.10.1-2build1_all.deb
 md5            = ddee0a62d486a6cc2f86028f08369505
@@ -242,6 +297,26 @@ file           = python-pushy_0.5.3-1_amd64.deb
 md5            = 9211c7c8c46ce30537c4c227259a0c10
 source         = repo:trusty
 
+[storage-python-rados_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = python-rados_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = abd52ab57422cedda18dbf65d7f442af
+source         = repo:trusty-updates-kilo
+
+[storage-python-rbd_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = python-rbd_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = f28b11f574ac638f04a70d8f9e7daa48
+source         = repo:trusty-updates-kilo
+
+[storage-radosgw_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = radosgw_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = 707a6d878844ed0887f31d11bac5c0ee
+source         = repo:trusty-updates-kilo
+
+[storage-rbd-fuse_0.94.8-0ubuntu0.15.04.1~cloud0]
+file           = rbd-fuse_0.94.8-0ubuntu0.15.04.1~cloud0_amd64.deb
+md5            = 29313ba0db09de24e1492ae3a6391887
+source         = repo:trusty-updates-kilo
+
 [storage-readline-common_6.3-4ubuntu2]
 file           = readline-common_6.3-4ubuntu2_all.deb
 md5            = d658036aeedbb56055420a216a45f613
@@ -277,9 +352,9 @@ file           = sysstat_10.2.0-1_amd64.deb
 md5            = c85d3d8c3d3162c4d6b2efe1b963e0d2
 source         = repo:trusty
 
-[storage-tgt_1:1.0.43-0ubuntu4.1~14.04.2]
-file           = tgt_1%%3a1.0.43-0ubuntu4.1~14.04.2_amd64.deb
-md5            = 3fee716804c6dd4452b40d3084e67696
+[storage-tgt_1:1.0.43-0ubuntu4.1~14.04.3]
+file           = tgt_1%%3a1.0.43-0ubuntu4.1~14.04.3_amd64.deb
+md5            = e662be318b3244b46bf8ab360add5b2e
 source         = repo:trusty-updates
 
 [storage-watershed_7]