Skip to content

Commit

Permalink
Storage package bug fix merge from 2.10
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Jeya ganesh babu J committed Mar 4, 2015
1 parent d054766 commit 773231c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Expand Up @@ -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
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -8,7 +8,7 @@ Build-Depends:
Package: contrail-openstack
Architecture: all
Maintainer: rrugge <rrugge@juniper.net>
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
2 changes: 1 addition & 1 deletion common/debian/contrail-openstack/debian/control.in
Expand Up @@ -8,7 +8,7 @@ Build-Depends:
Package: contrail-openstack
Architecture: all
Maintainer: rrugge <rrugge@juniper.net>
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
2 changes: 1 addition & 1 deletion common/debian/contrail-openstack/debian/control.juno.in
Expand Up @@ -8,7 +8,7 @@ Build-Depends:
Package: contrail-openstack
Architecture: all
Maintainer: rrugge <rrugge@juniper.net>
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

0 comments on commit 773231c

Please sign in to comment.