Merge "Mitaka: Adding package_type in depends files" into R3.2

build/package_configs/ubuntu1404/kilo/contrail_packages.cfg

@@ -187,7 +187,8 @@ package_type  = contrail-networking
 builtloc      = build/
 target        =
 sub_package_type = contrail-packages, vrouter-openstack-extra, cfgm-openstack-extra,
-                   contrail-thirdparty-packages, contrail-dependent-packages
+                   database-openstack-extra, contrail-thirdparty-packages, 
+                   contrail-dependent-packages
 
 [openstack-nova-deb]
 pkgs      = nova-api, nova-cells, nova-common, nova-compute,
@@ -234,7 +235,7 @@ package_type  = contrail-install-packages
 pkgs      = contrail-packages
 makeloc   = tools/packaging/common/debian
 package_type  = contrail-packages
-sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra
+sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra, database-openstack-extra
 
 [contrail-thirdparty-packages]
 pkgs      = contrail-thirdparty-packages
@@ -250,7 +251,7 @@ package_type  = contrail-dependent-packages
 pkgs      = contrail-openstack-packages
 makeloc   = tools/packaging/common/debian
 package_type  = contrail-openstack-packages
-sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra
+sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra, database-openstack-extra
 
 ###############################################################################
 # Default target sections

build/package_configs/ubuntu1404/kilo/depends_contrail_dependent_packages.cfg

@@ -1892,11 +1892,6 @@ file           = python-keystonemiddleware_1.5.0-0ubuntu1.1~cloud0_all.deb
 md5            = 08b3d70beb6c032e569000ccadae7253
 source         = repo:trusty-updates-kilo
 
-[python-kombu_3.0.24-0ubuntu2~cloud0]
-file           = python-kombu_3.0.24-0ubuntu2~cloud0_all.deb
-md5            = 81af04e108b4a99ec883bb5dda17f121
-source         = repo:trusty-updates-kilo
-
 [python-ldap_2.4.10-1build1]
 file           = python-ldap_2.4.10-1build1_amd64.deb
 md5            = 36ab6c8b74d3f2ac5959a605a20d0882

build/package_configs/ubuntu1404/kilo/depends_contrail_openstack_packages.cfg

@@ -188,6 +188,12 @@ file           = python-heatclient_0.3.0-0ubuntu1~cloud0_all.deb
 md5            = 41e9160c22d6e7922ccb8404f557bc1a
 source         = repo:trusty-updates-kilo
 
+[python-kombu_3.0.24-0ubuntu2~cloud0]
+file           = python-kombu_3.0.24-0ubuntu2~cloud0_all.deb
+md5            = 81af04e108b4a99ec883bb5dda17f121
+source         = repo:trusty-updates-kilo
+package_type   = contrail-install-packages, contrail-openstack-packages, database-openstack-extra
+
 [python-novaclient_1:2.22.0-0ubuntu2~cloud0]
 file           = python-novaclient_1%%3a2.22.0-0ubuntu2~cloud0_all.deb
 md5            = 17dde9f94180dc6ddc1d34625571f5c7

build/package_configs/ubuntu1404/liberty/contrail_packages.cfg

@@ -187,7 +187,8 @@ package_type  = contrail-networking
 builtloc      = build/
 target        =
 sub_package_type = contrail-packages, vrouter-openstack-extra, cfgm-openstack-extra,
-                   contrail-thirdparty-packages, contrail-dependent-packages
+                   database-openstack-extra, contrail-thirdparty-packages, 
+                   contrail-dependent-packages
 
 [openstack-nova-deb]
 pkgs      = nova-api, nova-cells, nova-common, nova-compute,
@@ -234,7 +235,7 @@ package_type  = contrail-install-packages
 pkgs      = contrail-packages
 makeloc   = tools/packaging/common/debian
 package_type  = contrail-packages
-sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra
+sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra, database-openstack-extra
 
 [contrail-thirdparty-packages]
 pkgs      = contrail-thirdparty-packages
@@ -250,7 +251,7 @@ package_type  = contrail-dependent-packages
 pkgs      = contrail-openstack-packages
 makeloc   = tools/packaging/common/debian
 package_type  = contrail-openstack-packages
-sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra
+sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra, database-openstack-extra
 
 ###############################################################################
 # Default target sections

build/package_configs/ubuntu1404/liberty/depends_contrail_openstack_packages.cfg

@@ -942,6 +942,7 @@ source         = repo:trusty-updates-liberty
 file           = python-kombu_3.0.26-1ubuntu2~cloud0_all.deb
 md5            = 81ea6bd41d8abeefbb7d1352de851f76
 source         = repo:trusty-updates-liberty
+package_type   = contrail-install-packages, contrail-openstack-packages, database-openstack-extra
 
 [python-ldap3_0.9.8.8-1ubuntu1~cloud0]
 file           = python-ldap3_0.9.8.8-1ubuntu1~cloud0_all.deb

build/package_configs/ubuntu1404/mitaka/contrail_packages.cfg

@@ -186,9 +186,9 @@ pkgs          =
 package_type  = contrail-networking
 builtloc      = build/
 target        =
-#sub_package_type = contrail-packages, vrouter-openstack-extra, cfgm-openstack-extra,
-sub_package_type = contrail-packages, vrouter-openstack-extra,
-                   contrail-thirdparty-packages, contrail-dependent-packages
+sub_package_type = contrail-packages, vrouter-openstack-extra, cfgm-openstack-extra,
+                   database-openstack-extra, contrail-thirdparty-packages, 
+                   contrail-dependent-packages
 
 [openstack-nova-deb]
 pkgs      = nova-api, nova-cells, nova-common, nova-compute,
@@ -241,8 +241,7 @@ package_type  = contrail-install-packages
 pkgs      = contrail-packages
 makeloc   = tools/packaging/common/debian
 package_type  = contrail-packages
-sub_package_type = vrouter-openstack-extra
-#sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra
+sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra, database-openstack-extra
 
 [contrail-thirdparty-packages]
 pkgs      = contrail-thirdparty-packages
@@ -258,8 +257,7 @@ package_type  = contrail-dependent-packages
 pkgs      = contrail-openstack-packages
 makeloc   = tools/packaging/common/debian
 package_type  = contrail-openstack-packages
-sub_package_type = vrouter-openstack-extra
-#sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra
+sub_package_type = vrouter-openstack-extra, cfgm-openstack-extra, database-openstack-extra
 
 ###############################################################################
 # Default target sections

build/package_configs/ubuntu1404/mitaka/depends_contrail_dependent_packages.cfg

@@ -854,11 +854,6 @@ file           = python-castellan_0.4.0-1~cloud0_all.deb
 md5            = 527cc503e1bf0d603d8e0ea0c5fb04c5
 source         = repo:trusty-updates-mitaka/main/
 
-[python-cinderclient_1:1.6.0-2~cloud0]
-file           = python-cinderclient_1%%3a1.6.0-2~cloud0_all.deb
-md5            = 74823200f1d516036146b917be8f54bc
-source         = repo:trusty-updates-mitaka/main/
-
 [python-dogpile.cache_0.5.7-1ubuntu1~cloud0]
 file           = python-dogpile.cache_0.5.7-1ubuntu1~cloud0_all.deb
 md5            = b96cabc9aec2c296aeedf2bb512d5836
@@ -869,11 +864,6 @@ file           = python-dogpile.core_0.4.1+dfsg1-3~cloud0_all.deb
 md5            = c67baaa17edc5ed8f4a5823a35f6f36f
 source         = repo:trusty-updates-mitaka/main/
 
-[python-glanceclient_1:2.0.0-2ubuntu0.16.04.1~cloud0]
-file           = python-glanceclient_1%%3a2.0.0-2ubuntu0.16.04.1~cloud0_all.deb
-md5            = 4ee34ace0091019c75c36ce37b866a7a
-source         = repo:trusty-updates-mitaka/main/
-
 [python-json-patch_1.19-3~cloud0]
 file           = python-json-patch_1.19-3~cloud0_all.deb
 md5            = 065838084d0333a2c144de1fc29aa148

build/package_configs/ubuntu1404/mitaka/depends_contrail_openstack_packages.cfg

@@ -77,6 +77,7 @@ source         = repo:trusty-updates-mitaka/main/
 file           = ceilometer-agent-compute_1%%3a6.1.3-0ubuntu1~cloud0_all.deb
 md5            = 17f3a0825143c7828aa54c8b23e76766
 source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [ceilometer-agent-notification_1:6.1.3-0ubuntu1~cloud0]
 file           = ceilometer-agent-notification_1%%3a6.1.3-0ubuntu1~cloud0_all.deb
@@ -97,6 +98,7 @@ source         = repo:trusty-updates-mitaka/main/
 file           = ceilometer-common_1%%3a6.1.3-0ubuntu1~cloud0_all.deb
 md5            = b08dbbe26c1e764816bf697ea51415f8
 source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [cinder-api_2:8.1.1-0ubuntu1~cloud0]
 file           = cinder-api_2%%3a8.1.1-0ubuntu1~cloud0_all.deb
@@ -637,6 +639,19 @@ source         = repo:trusty-updates-mitaka/main/
 file           = python-ceilometer_1%%3a6.1.3-0ubuntu1~cloud0_all.deb
 md5            = 9b4350a2e3f7bdae9785a1932bf15090
 source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
+
+[python-cinderclient_1:1.6.0-2~cloud0]
+file           = python-cinderclient_1%%3a1.6.0-2~cloud0_all.deb
+md5            = 74823200f1d516036146b917be8f54bc
+source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
+
+[python-glanceclient_1:2.0.0-2ubuntu0.16.04.1~cloud0]
+file           = python-glanceclient_1%%3a2.0.0-2ubuntu0.16.04.1~cloud0_all.deb
+md5            = 4ee34ace0091019c75c36ce37b866a7a
+source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [python-gridfs_3.2-1build1~cloud0]
 file           = python-gridfs_3.2-1build1~cloud0_all.deb
@@ -852,6 +867,7 @@ source         = repo:trusty-updates-mitaka/main/
 file           = python-ceilometerclient_2.4.0-2~cloud0_all.deb
 md5            = 626b0ff23c83591e55dd5329e97e26bc
 source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [python-cffi_1.5.2-1ubuntu1~cloud0]
 file           = python-cffi_1.5.2-1ubuntu1~cloud0_all.deb
@@ -1157,6 +1173,7 @@ source         = repo:trusty-updates-mitaka/main/
 file           = python-kombu_3.0.33-1ubuntu2~cloud0_all.deb
 md5            = 2c45225978aea132143824c56b7598fb
 source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, database-openstack-extra 
 
 [python-ldap_2.4.22-0.1~cloud0]
 file           = python-ldap_2.4.22-0.1~cloud0_amd64.deb
@@ -1237,6 +1254,7 @@ source         = repo:trusty-updates-mitaka/main/
 file           = python-novaclient_2%%3a3.3.1-2~cloud0_all.deb
 md5            = 4ea09596e5c429ebd9f3d1846d6b8841
 source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra, cfgm-openstack-extra
 
 [python-novnc_1:0.4+dfsg+1+20131010+gitf68af8af3d-2]
 file           = python-novnc_1%%3a0.4+dfsg+1+20131010+gitf68af8af3d-2_all.deb
@@ -1582,6 +1600,7 @@ source         = repo:trusty-updates-mitaka/main/
 file           = python-swiftclient_1%%3a3.0.0-0ubuntu1~cloud0_all.deb
 md5            = e45f9c13889c301bcbc844f788847e02
 source         = repo:trusty-updates-mitaka/main/
+package_type   = contrail-install-packages, contrail-openstack-packages, vrouter-openstack-extra
 
 [python-taskflow_1.30.0-1ubuntu1~cloud0]
 file           = python-taskflow_1.30.0-1ubuntu1~cloud0_all.deb