Merge "Closes-Bug #1587645. Updated the package that has the /usr/bin…

…/ifmap-server script change to allow supervisor to manage ifmap-server for ungracefull stops" into R3.0
Juniper · Aug 6, 2016 · ab03a11 · ab03a11
2 parents 6f87828 + 2347ead
commit ab03a11
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/build/package_configs/centos65/havana/depends_packages.cfg b/build/package_configs/centos65/havana/depends_packages.cfg
@@ -1752,8 +1752,8 @@ file = ifmap-python-client-0.3.2-1407190101.el6.noarch.rpm
 md5  = d1a2256cc7c612e712f981087c28b4cf
 
 [ifmap-server]
-file = ifmap-server-0.3.2-2contrail.el6.noarch.rpm
-md5  = 512e5c97a0608de137fa6d2e550bd5ba
+file = ifmap-server-0.3.2-4contrail.el6.noarch.rpm
+md5  = a02bfbb7b83fa56ab8617fb7de3285ad
 package_type = contrail-install-packages, contrail-thirdparty-packages
 
 [authbind]

diff --git a/build/package_configs/centos65/icehouse/depends_packages.cfg b/build/package_configs/centos65/icehouse/depends_packages.cfg
@@ -650,8 +650,8 @@ file  = ifmap-python-client-0.3.2-1407190101.el6.noarch.rpm
 md5   = d1a2256cc7c612e712f981087c28b4cf
 
 [ifmap-server_0.3.2_1408082330.el6]
-file  = ifmap-server-0.3.2-2contrail.el6.noarch.rpm
-md5   = 512e5c97a0608de137fa6d2e550bd5ba
+file  = ifmap-server-0.3.2-4contrail.el6.noarch.rpm
+md5   = a02bfbb7b83fa56ab8617fb7de3285ad
 package_type = contrail-install-packages, contrail-thirdparty-packages
 
 [ipmitool_1.8.11_16.el6]

diff --git a/build/package_configs/centoslinux71/juno/depends_contrail_thirdparty_packages.cfg b/build/package_configs/centoslinux71/juno/depends_contrail_thirdparty_packages.cfg
@@ -55,9 +55,9 @@ md5            = e83decbf4017da6f47696842aa909e13
 file           = hc-httpcore-4.1-1.jpp6.noarch.rpm
 md5            = 65d9fbf17070841708643f7eaa000071
 
-[ifmap-server-0.3.2-2contrail.el7]
-file           = ifmap-server-0.3.2-2contrail.el7.noarch.rpm
-md5            = 3f89792cf3d8a781e7e38f17e5b2e6f6
+[ifmap-server-0.3.2-4contrail.el7]
+file           = ifmap-server-0.3.2-4contrail.el7.noarch.rpm
+md5            = dadaab3b4170315b47286981b0b83622
 
 [kafka-2.11-0.9.0.1.0contrail0.el7.centos]
 file           = kafka-2.11-0.9.0.1.0contrail0.el7.centos.x86_64.rpm

diff --git a/build/package_configs/centoslinux71/kilo/depends_contrail_thirdparty_packages.cfg b/build/package_configs/centoslinux71/kilo/depends_contrail_thirdparty_packages.cfg
@@ -61,9 +61,9 @@ md5            = e83decbf4017da6f47696842aa909e13
 file           = hc-httpcore-4.1-1.jpp6.noarch.rpm
 md5            = 65d9fbf17070841708643f7eaa000071
 
-[ifmap-server-0.3.2-2contrail.el7]
-file           = ifmap-server-0.3.2-2contrail.el7.noarch.rpm
-md5            = 3f89792cf3d8a781e7e38f17e5b2e6f6
+[ifmap-server-0.3.2-4contrail.el7]
+file           = ifmap-server-0.3.2-4contrail.el7.noarch.rpm
+md5            = dadaab3b4170315b47286981b0b83622
 
 [kafka-2.11-0.9.0.1.0contrail0.el7.centos]
 file           = kafka-2.11-0.9.0.1.0contrail0.el7.centos.x86_64.rpm

diff --git a/build/package_configs/centoslinux71/liberty/depends_contrail_thirdparty_packages.cfg b/build/package_configs/centoslinux71/liberty/depends_contrail_thirdparty_packages.cfg
@@ -66,9 +66,9 @@ md5            = e83decbf4017da6f47696842aa909e13
 file           = hc-httpcore-4.1-1.jpp6.noarch.rpm
 md5            = 65d9fbf17070841708643f7eaa000071
 
-[ifmap-server-0.3.2-2contrail.el7]
-file           = ifmap-server-0.3.2-2contrail.el7.noarch.rpm
-md5            = 3f89792cf3d8a781e7e38f17e5b2e6f6
+[ifmap-server-0.3.2-4contrail.el7]
+file           = ifmap-server-0.3.2-4contrail.el7.noarch.rpm
+md5            = dadaab3b4170315b47286981b0b83622
 
 [kafka-2.11-0.9.0.1.0contrail0.el7.centos]
 file           = kafka-2.11-0.9.0.1.0contrail0.el7.centos.x86_64.rpm

diff --git a/...ckage_configs/redhatenterpriselinuxserver70/juno/depends_contrail_thirdparty_packages.cfg b/...ckage_configs/redhatenterpriselinuxserver70/juno/depends_contrail_thirdparty_packages.cfg
@@ -73,9 +73,9 @@ file           = hc-httpcore-4.1-1.jpp6.noarch.rpm
 md5            = 65d9fbf17070841708643f7eaa000071
 source         = repo:contrail-thirdparty
 
-[ifmap-server-0.3.2-2contrail.el7]
-file           = ifmap-server-0.3.2-2contrail.el7.noarch.rpm
-md5            = 3f89792cf3d8a781e7e38f17e5b2e6f6
+[ifmap-server-0.3.2-4contrail.el7]
+file           = ifmap-server-0.3.2-4contrail.el7.noarch.rpm
+md5            = 4b25a4ad403ab11bb6ac709d822f65a7
 source         = repo:contrail-thirdparty
 
 [kafka-2.11-0.9.0.1.0contrail0.el7]

diff --git a/...ckage_configs/redhatenterpriselinuxserver70/kilo/depends_contrail_thirdparty_packages.cfg b/...ckage_configs/redhatenterpriselinuxserver70/kilo/depends_contrail_thirdparty_packages.cfg
@@ -74,9 +74,9 @@ file           = hc-httpcore-4.1-1.jpp6.noarch.rpm
 md5            = 65d9fbf17070841708643f7eaa000071
 source         = repo:contrail-thirdparty
 
-[ifmap-server-0.3.2-2contrail.el7]
-file           = ifmap-server-0.3.2-2contrail.el7.noarch.rpm
-md5            = 3f89792cf3d8a781e7e38f17e5b2e6f6
+[ifmap-server-0.3.2-4contrail.el7]
+file           = ifmap-server-0.3.2-4contrail.el7.noarch.rpm
+md5            = 4b25a4ad403ab11bb6ac709d822f65a7
 source         = repo:contrail-thirdparty
 
 [kafka-2.11-0.9.0.1.0contrail0.el7]

diff --git a/...ge_configs/redhatenterpriselinuxserver70/liberty/depends_contrail_thirdparty_packages.cfg b/...ge_configs/redhatenterpriselinuxserver70/liberty/depends_contrail_thirdparty_packages.cfg
@@ -75,9 +75,9 @@ file           = hc-httpcore-4.1-1.jpp6.noarch.rpm
 md5            = 65d9fbf17070841708643f7eaa000071
 source         = repo:contrail-thirdparty
 
-[ifmap-server-0.3.2-2contrail.el7]
-file           = ifmap-server-0.3.2-2contrail.el7.noarch.rpm
-md5            = 3f89792cf3d8a781e7e38f17e5b2e6f6
+[ifmap-server-0.3.2-4contrail.el7]
+file           = ifmap-server-0.3.2-4contrail.el7.noarch.rpm
+md5            = 4b25a4ad403ab11bb6ac709d822f65a7
 source         = repo:contrail-thirdparty
 
 [kafka-2.11-0.9.0.1.0contrail0.el7]

diff --git a/common/rpm/contrail-openstack-config-common.spec b/common/rpm/contrail-openstack-config-common.spec
@@ -47,7 +47,7 @@ Requires: python-contrail >= %{_verstr}-%{_relstr}
 Requires: contrail-config-openstack >= %{_verstr}-%{_relstr}
 Requires: python-bottle
 Requires: contrail-nodemgr  >= %{_verstr}-%{_relstr}
-Requires: ifmap-server >= 0.3.2-2contrail
+Requires: ifmap-server >= 0.3.2-4contrail
 Requires: python-neutron-lbaas
 %if 0%{?rhel} && 0%{?rhel} <= 6
 Requires: python-importlib

diff --git a/common/rpm/contrail-openstack-config.spec b/common/rpm/contrail-openstack-config.spec
@@ -45,7 +45,7 @@ Requires: keepalived
 Requires: rabbitmq-server >= 3.3.5
 Requires: python-bottle >= 0.11.6
 Requires: contrail-nodemgr >= %{_verstr}-%{_relstr}
-Requires: ifmap-server >= 0.3.2-2contrail
+Requires: ifmap-server >= 0.3.2-4contrail
 Requires: contrail-config-openstack >= %{_verstr}-%{_relstr}
 Requires: python-contrail >= %{_verstr}-%{_relstr}
 %if 0%{?rhel} && 0%{?rhel} <= 6

diff --git a/common/rpm/contrail-openstack-havana-config.spec b/common/rpm/contrail-openstack-havana-config.spec
@@ -44,7 +44,7 @@ Requires: python-contrail >= %{_verstr}-%{_relstr}
 Requires: contrail-config-openstack >= %{_verstr}-%{_relstr}
 Requires: python-bottle
 Requires: contrail-nodemgr  >= %{_verstr}-%{_relstr}
-Requires: ifmap-server >= 0.3.2-2contrail
+Requires: ifmap-server >= 0.3.2-4contrail
 %if 0%{?rhel} && 0%{?rhel} <= 6
 Requires: python-importlib
 %endif

diff --git a/common/rpm/contrail-openstack-icehouse-config.spec b/common/rpm/contrail-openstack-icehouse-config.spec
@@ -47,7 +47,7 @@ Requires: python-contrail >= %{_verstr}-%{_relstr}
 Requires: contrail-config-openstack >= %{_verstr}-%{_relstr}
 Requires: python-bottle
 Requires: contrail-nodemgr  >= %{_verstr}-%{_relstr}
-Requires: ifmap-server >= 0.3.2-2contrail
+Requires: ifmap-server >= 0.3.2-4contrail
 %if 0%{?rhel} && 0%{?rhel} <= 6
 Requires: python-importlib
 %endif