From 773231cf081cc75154ceb91796b4523f50fcc95e Mon Sep 17 00:00:00 2001 From: Jeya ganesh babu J Date: Tue, 3 Mar 2015 17:41:40 -0800 Subject: [PATCH] Storage package bug fix merge from 2.10 Closes-Bug: #1410486 Closes-Bug: #1416163 qemu-utils package dependency added to be installed on openstack nodes to support boot volume creation Included fix for Ceph mon log which was passing a wrong argument to a channel call. Use ceph-0.87-2 which is built with the fix Change-Id: I671cf25544ffb1f479fb3ecdb51e933bad3e5565 --- .../ubuntu1204/icehouse/depends_storage_packages.cfg | 4 ++-- .../ubuntu1404/icehouse/depends_storage_packages.cfg | 4 ++-- common/debian/contrail-openstack/debian/control.icehouse.in | 2 +- common/debian/contrail-openstack/debian/control.in | 2 +- common/debian/contrail-openstack/debian/control.juno.in | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg b/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg index 9cf4624b3..2916b306c 100644 --- a/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg +++ b/build/package_configs/ubuntu1204/icehouse/depends_storage_packages.cfg @@ -29,8 +29,8 @@ file = ceph-fs-common_0.87-1_amd64.deb md5 = 0ea3999d402a1113e89327733e4c955b [ceph] -file = ceph_0.87-1_amd64.deb -md5 = a117c4dda36b04c96aa67189d380f683 +file = ceph_0.87-2_amd64.deb +md5 = 59f1093ff4bf6845b39e181b19dbd226 [ceph-fuse] file = ceph-fuse_0.87-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 index 8e34f0ccf..13373f2b1 100644 --- a/build/package_configs/ubuntu1404/icehouse/depends_storage_packages.cfg +++ b/build/package_configs/ubuntu1404/icehouse/depends_storage_packages.cfg @@ -21,8 +21,8 @@ file = libcephfs1_0.87-1_amd64.deb md5 = 732508f16384c3af23f0353851dc2caf [ceph] -file = ceph_0.87-1_amd64.deb -md5 = baf5df9416d4a6bf5d4c16e282902a4c +file = ceph_0.87-2_amd64.deb +md5 = 43f6fe722730bfd4d1b66b6b3d569d0a [ceph-common] file = ceph-common_0.87-1_amd64.deb diff --git a/common/debian/contrail-openstack/debian/control.icehouse.in b/common/debian/contrail-openstack/debian/control.icehouse.in index 4d084ffdc..2714afe7e 100644 --- a/common/debian/contrail-openstack/debian/control.icehouse.in +++ b/common/debian/contrail-openstack/debian/control.icehouse.in @@ -8,7 +8,7 @@ Build-Depends: Package: contrail-openstack Architecture: all Maintainer: rrugge -Depends: python-contrail, openstack-dashboard, contrail-openstack-dashboard, glance, keystone, nova-api, nova-common, nova-conductor, nova-console, nova-objectstore, nova-scheduler, cinder-api, cinder-common, cinder-scheduler, mysql-server-wsrep, libssl0.9.8, contrail-setup, contrail-utils, memcached, nova-novncproxy, nova-consoleauth, python-m2crypto, haproxy (>=1.5.4-1ppa1~precise), rabbitmq-server, apache2, libapache2-mod-wsgi, python-memcache, python-iniparse, python-qpid, euca2ools, nfs-common, supervisor, rabbitmq-server, heat-api, heat-engine, heat-common, python-extras, python-heat, python-mimeparse, python-testtools, contrail-heat +Depends: python-contrail, openstack-dashboard, contrail-openstack-dashboard, glance, keystone, nova-api, nova-common, nova-conductor, nova-console, nova-objectstore, nova-scheduler, cinder-api, cinder-common, cinder-scheduler, mysql-server-wsrep, libssl0.9.8, contrail-setup, contrail-utils, memcached, nova-novncproxy, nova-consoleauth, python-m2crypto, haproxy (>=1.5.4-1ppa1~precise), rabbitmq-server, apache2, libapache2-mod-wsgi, python-memcache, python-iniparse, python-qpid, euca2ools, nfs-common, supervisor, rabbitmq-server, heat-api, heat-engine, heat-common, python-extras, python-heat, python-mimeparse, python-testtools, contrail-heat, qemu-utils Section: contrail-openstack Priority: extra Description: Contrail Openstack composite debian package diff --git a/common/debian/contrail-openstack/debian/control.in b/common/debian/contrail-openstack/debian/control.in index 3453e05a9..4043e11f5 100644 --- a/common/debian/contrail-openstack/debian/control.in +++ b/common/debian/contrail-openstack/debian/control.in @@ -8,7 +8,7 @@ Build-Depends: Package: contrail-openstack Architecture: all Maintainer: rrugge -Depends: python-contrail, openstack-dashboard, contrail-openstack-dashboard, glance, keystone, nova-api, nova-common, nova-conductor, nova-console, nova-objectstore, nova-scheduler, cinder-api, cinder-common, cinder-scheduler, mysql-server-wsrep, libssl0.9.8, contrail-setup, contrail-utils, memcached, nova-novncproxy, nova-consoleauth, python-m2crypto, haproxy (>=1.5.4-1ppa1~precise), apache2, libapache2-mod-wsgi, python-memcache, python-iniparse, python-qpid, euca2ools, nfs-common, supervisor, rabbitmq-server +Depends: python-contrail, openstack-dashboard, contrail-openstack-dashboard, glance, keystone, nova-api, nova-common, nova-conductor, nova-console, nova-objectstore, nova-scheduler, cinder-api, cinder-common, cinder-scheduler, mysql-server-wsrep, libssl0.9.8, contrail-setup, contrail-utils, memcached, nova-novncproxy, nova-consoleauth, python-m2crypto, haproxy (>=1.5.4-1ppa1~precise), apache2, libapache2-mod-wsgi, python-memcache, python-iniparse, python-qpid, euca2ools, nfs-common, supervisor, rabbitmq-server, qemu-utils Section: contrail-openstack Priority: extra Description: Contrail Openstack composite debian package diff --git a/common/debian/contrail-openstack/debian/control.juno.in b/common/debian/contrail-openstack/debian/control.juno.in index f95d28dd6..63e4b6d05 100644 --- a/common/debian/contrail-openstack/debian/control.juno.in +++ b/common/debian/contrail-openstack/debian/control.juno.in @@ -8,7 +8,7 @@ Build-Depends: Package: contrail-openstack Architecture: all Maintainer: rrugge -Depends: python-contrail, openstack-dashboard, glance, keystone, nova-api, nova-common, nova-conductor, nova-console, nova-objectstore, nova-scheduler, cinder-api, cinder-common, cinder-scheduler, mysql-server-wsrep, libssl0.9.8, contrail-setup, contrail-utils, memcached, nova-novncproxy, nova-consoleauth, python-m2crypto, haproxy, rabbitmq-server, apache2, libapache2-mod-wsgi, python-memcache, python-iniparse, python-qpid, euca2ools, nfs-common, supervisor, rabbitmq-server, heat-api, heat-engine, heat-common, python-extras, python-heat, python-mimeparse, python-testtools, contrail-heat +Depends: python-contrail, openstack-dashboard, glance, keystone, nova-api, nova-common, nova-conductor, nova-console, nova-objectstore, nova-scheduler, cinder-api, cinder-common, cinder-scheduler, mysql-server-wsrep, libssl0.9.8, contrail-setup, contrail-utils, memcached, nova-novncproxy, nova-consoleauth, python-m2crypto, haproxy, rabbitmq-server, apache2, libapache2-mod-wsgi, python-memcache, python-iniparse, python-qpid, euca2ools, nfs-common, supervisor, rabbitmq-server, heat-api, heat-engine, heat-common, python-extras, python-heat, python-mimeparse, python-testtools, contrail-heat, qemu-utils Section: contrail-openstack Priority: extra Description: Contrail Openstack composite debian package