Merge "Upgrading to new version of python-kafka. Closes-Bug: 1549625"…

… into R3.0
Juniper · Mar 17, 2016 · 561de8f · 561de8f
2 parents 11c5eb3 + 5008273
commit 561de8f
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 29 deletions.
diff --git a/build/package_configs/centoslinux71/juno/depends_contrail_thirdparty_packages.cfg b/build/package_configs/centoslinux71/juno/depends_contrail_thirdparty_packages.cfg
@@ -139,6 +139,10 @@ md5            = 045388afa560fce0ebdd47bf18bef3b5
 file           = python-kafka-python-0.9.4-1.1.noarch.rpm
 md5            = d6901cbe82f61880ba7c741f65e68fb3
 
+[python-kafka-1.0.1-0contrail0.el7.centos.noarch]
+file           = python-kafka-1.0.1-0contrail0.el7.centos.noarch.rpm
+md5            = 241862887705c1c787a90a4e2403a98b
+
 [python-kazoo-1.3.1_1.1contrail2.el7]
 file  = python-kazoo-1.3.1-1.1contrail2.el7.centos.noarch.rpm
 md5   = 11f3ee671efc37a4b7941275d55cba06

diff --git a/build/package_configs/centoslinux71/kilo/depends_contrail_thirdparty_packages.cfg b/build/package_configs/centoslinux71/kilo/depends_contrail_thirdparty_packages.cfg
@@ -145,6 +145,10 @@ md5            = 5180b60b42598b19a809bb79f28f3058
 file           = python-kafka-python-0.9.4-1.1.noarch.rpm
 md5            = d6901cbe82f61880ba7c741f65e68fb3
 
+[python-kafka-1.0.1-0contrail0.el7.centos.noarch]
+file           = python-kafka-1.0.1-0contrail0.el7.centos.noarch.rpm
+md5            = 241862887705c1c787a90a4e2403a98b
+
 [python-kazoo-1.3.1_1.1contrail2.el7]
 file  = python-kazoo-1.3.1-1.1contrail2.el7.centos.noarch.rpm
 md5   = 11f3ee671efc37a4b7941275d55cba06

diff --git a/...ckage_configs/redhatenterpriselinuxserver70/juno/depends_contrail_thirdparty_packages.cfg b/...ckage_configs/redhatenterpriselinuxserver70/juno/depends_contrail_thirdparty_packages.cfg
@@ -133,6 +133,11 @@ file           = python-jsonpickle-0.3.1-2.1.el7.noarch.rpm
 md5            = b8686001c5202e5ee4eb25230dd7ba1d
 source         = repo:contrail-thirdparty
 
+[python-kafka-1.0.1-0contrail0.el7.noarch]
+file           = python-kafka-1.0.1-0contrail0.el7.noarch.rpm
+md5            = ac166cc3e5fd6d5f44f3070443f2ef26
+source         = repo:contrail-thirdparty
+
 [python-kafka-python-0.9.4-1.1]
 file           = python-kafka-python-0.9.4-1.1.noarch.rpm
 md5            = d6901cbe82f61880ba7c741f65e68fb3

diff --git a/build/package_configs/redhatenterpriselinuxserver70/juno/depends_packages.cfg.moved b/build/package_configs/redhatenterpriselinuxserver70/juno/depends_packages.cfg.moved
@@ -2081,6 +2081,11 @@ md5   = 326143409019965bed1bef2d6e8b8fa0
 file  = python-jsonschema-2.3.0-1.el7ost.noarch.rpm
 md5   = 7dcee27a91bf51c999f2f0c3df71ce7d
 
+[python-kafka-1.0.1-0contrail0.el7.noarch]
+file           = python-kafka-1.0.1-0contrail0.el7.noarch.rpm
+md5            = ac166cc3e5fd6d5f44f3070443f2ef26
+package_type   = contrail-install-packages
+
 [python-kafka-python-0.9.4-1.1.noarch]
 file  = python-kafka-python-0.9.4-1.1.noarch.rpm
 md5   = d6901cbe82f61880ba7c741f65e68fb3

diff --git a/...ckage_configs/redhatenterpriselinuxserver70/kilo/depends_contrail_thirdparty_packages.cfg b/...ckage_configs/redhatenterpriselinuxserver70/kilo/depends_contrail_thirdparty_packages.cfg
@@ -139,6 +139,11 @@ file           = python-jsonpickle-0.3.1-2.1.el7.noarch.rpm
 md5            = b8686001c5202e5ee4eb25230dd7ba1d
 source         = repo:contrail-thirdparty
 
+[python-kafka-1.0.1-0contrail0.el7.noarch]
+file           = python-kafka-1.0.1-0contrail0.el7.noarch.rpm
+md5            = ac166cc3e5fd6d5f44f3070443f2ef26
+source         = repo:contrail-thirdparty
+
 [python-kafka-python-0.9.4-1.1.noarch]
 file           = python-kafka-python-0.9.4-1.1.noarch.rpm
 md5            = d6901cbe82f61880ba7c741f65e68fb3

diff --git a/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/icehouse/depends_contrail_thirdparty_packages.cfg
@@ -75,13 +75,9 @@ md5            = 6ba90f706ec78584adb3a15657f290e3
 file           = python-geventhttpclient_1.1.0-1contrail1_amd64.deb
 md5            = 1a00d30b23e355a014e90b75243f3227
 
-[python-kafka-python_0.9.2-0contrail0]
-file           = python-kafka-python_0.9.2-0contrail0_all.deb
-md5            = ca72ef4061c3f6a6a1c4f3b3e1b3bc84
-
-[python-kafka_0.9.3-2+syseleven1_all]
-file           = python-kafka_0.9.3-2+syseleven1_all.deb
-md5            = d00fb946087ded001c2c89be6cfba320
+[python-kafka_1.0.1-0contrail0]
+file           = python-kafka_1.0.1-0contrail0_amd64.deb
+md5            = e8e1d6233260caa5d4478c639b04afcd
 
 [python-kazoo_1.3.1-1contrail2]
 file           = python-kazoo_1.3.1-1contrail2_all.deb

diff --git a/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/juno/depends_contrail_thirdparty_packages.cfg
@@ -96,15 +96,11 @@ file           = python-geventhttpclient_1.1.0-1contrail1_amd64.deb
 md5            = 1a00d30b23e355a014e90b75243f3227
 source         = repo:contrail-thirdparty
 
-[python-kafka-python_0.9.2-0contrail0]
-file           = python-kafka-python_0.9.2-0contrail0_all.deb
-md5            = ca72ef4061c3f6a6a1c4f3b3e1b3bc84
+[python-kafka_1.0.1-0contrail0]
+file           = python-kafka_1.0.1-0contrail0_amd64.deb
+md5            = e8e1d6233260caa5d4478c639b04afcd
 source         = repo:contrail-thirdparty
 
-[python-kafka_0.9.3-2+syseleven1_all]
-file           = python-kafka_0.9.3-2+syseleven1_all.deb
-md5            = d00fb946087ded001c2c89be6cfba320
-
 [python-kazoo_1.3.1-1contrail2]
 file           = python-kazoo_1.3.1-1contrail2_all.deb
 md5            = 1160ffdc6faa72bfb6f027f5e7b18bb1

diff --git a/build/package_configs/ubuntu1404/kilo/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/kilo/depends_contrail_thirdparty_packages.cfg
@@ -107,14 +107,9 @@ file           = python-geventhttpclient_1.1.0-1contrail1_amd64.deb
 md5            = 1a00d30b23e355a014e90b75243f3227
 source         = repo:contrail-thirdparty
 
-[python-kafka-python_0.9.2-0contrail0]
-file           = python-kafka-python_0.9.2-0contrail0_all.deb
-md5            = ca72ef4061c3f6a6a1c4f3b3e1b3bc84
-source         = repo:contrail-thirdparty
-
-[python-kafka_0.9.3-2+syseleven1]
-file           = python-kafka_0.9.3-2+syseleven1_all.deb
-md5            = d00fb946087ded001c2c89be6cfba320
+[python-kafka_1.0.1-0contrail0]
+file           = python-kafka_1.0.1-0contrail0_amd64.deb
+md5            = e8e1d6233260caa5d4478c639b04afcd
 source         = repo:contrail-thirdparty
 
 [python-kazoo_1.3.1-1contrail2]

diff --git a/build/package_configs/ubuntu1404/vcenter/depends_contrail_thirdparty_packages.cfg b/build/package_configs/ubuntu1404/vcenter/depends_contrail_thirdparty_packages.cfg
@@ -75,13 +75,9 @@ md5            = 6ba90f706ec78584adb3a15657f290e3
 file           = python-geventhttpclient_1.1.0-1contrail1_amd64.deb
 md5            = 1a00d30b23e355a014e90b75243f3227
 
-[python-kafka-python_0.9.2-0contrail0]
-file           = python-kafka-python_0.9.2-0contrail0_all.deb
-md5            = ca72ef4061c3f6a6a1c4f3b3e1b3bc84
-
-[python-kafka_0.9.3-2+syseleven1_all]
-file           = python-kafka_0.9.3-2+syseleven1_all.deb
-md5            = d00fb946087ded001c2c89be6cfba320
+[python-kafka_1.0.1-0contrail0]
+file           = python-kafka_1.0.1-0contrail0_amd64.deb
+md5            = e8e1d6233260caa5d4478c639b04afcd
 
 [python-kazoo_1.3.1-1contrail2]
 file           = python-kazoo_1.3.1-1contrail2_all.deb