Merge "Move contrail-nova-vif dependency from contrail-vrouter-common…

… to contrail-openstack-vrouter as contrail-nova-vif brings openstack related packages as depends" into R2.20
Juniper · May 19, 2015 · cb72491 · cb72491
2 parents 2f59491 + faa034e
commit cb72491
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/common/debian/contrail-openstack-vrouter/debian/control.in b/common/debian/contrail-openstack-vrouter/debian/control.in
@@ -8,5 +8,5 @@ Build-Depends:
 Package: contrail-openstack-vrouter
 Architecture: all
 Maintainer: amoghe <amoghe@juniper.net>
-Depends: contrail-vrouter-common, nova-compute, python-novaclient, librabbitmq0, nfs-kernel-server
+Depends: contrail-vrouter-common, contrail-nova-vif, nova-compute, python-novaclient, librabbitmq0, nfs-kernel-server
 Description: Contrail Openstack vRouter composite debian package
diff --git a/common/debian/contrail-vrouter-common/debian/control.in b/common/debian/contrail-vrouter-common/debian/control.in
@@ -8,5 +8,5 @@ Build-Depends:
 Package: contrail-vrouter-common
 Architecture: all
 Maintainer: amoghe <ijohnson@juniper.net>
-Depends: contrail-nodemgr, contrail-setup, contrail-utils, contrail-vrouter-init | contrail-vrouter-dpdk-init, python-iniparse, contrail-nova-vif, linux-crashdump, contrail-vrouter
+Depends: contrail-nodemgr, contrail-setup, contrail-utils, contrail-vrouter-init | contrail-vrouter-dpdk-init, python-iniparse, linux-crashdump, contrail-vrouter
 Description: Contrail vRouter composite debian package