Cloud changes for packaging

Change-Id: Ib4071e72ef7f59974bd1c6095690c483958a97c9

build/libs/packager/common.py

@@ -75,10 +75,21 @@ def ks_build(self):
         pkgtypes = list(set(sorted(contrail_pkgs_dict.keys() +
                                    depends_pkgs_dict.keys() +
                                    base_pkgs_dict.keys())))
+
         if 'contrail-install-packages' in pkgtypes:
             pkgtypes.remove('contrail-install-packages')
             pkgtypes = ['contrail-install-packages'] + pkgtypes
 
+        print pkgtypes
+        if 'contrail-packages' in pkgtypes:
+            pkgtypes.remove('contrail-packages')
+            pkgtypes = ['contrail-packages'] + pkgtypes
+            print pkgtypes
+            if 'contrail-install-packages' in pkgtypes:
+                pkgtypes.remove('contrail-install-packages')
+                pkgtypes = pkgtypes + ['contrail-install-packages']
+        print pkgtypes
+
         # create packager stores
         self.create_dir(self.store)
         self.create_dir(self.store_log_dir)

build/package_configs/ubuntu1204/havana/contrail_packages.cfg

@@ -21,7 +21,7 @@ pkg_pattern   = {pkg}_[0-9]*.deb
 builtloc      = build/debian/
 target        = %(__name__)s
 makeloc       =
-package_type  = contrail-install-packages, contrail-packages
+package_type  = contrail-packages
 
 [contrail]
 pkgs      = contrail-analytics, contrail-config, contrail-control, contrail-lib,
@@ -68,41 +68,42 @@ makeloc   = tools/packaging/common/debian
 [contrail-fabric-utils-deb]
 pkgs      = contrail-fabric-utils
 makeloc   = tools/packaging/common/debian
+package_type  = contrail-installer-package
 
 [contrail-openstack-deb]
 pkgs      = contrail-openstack
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-install-packages, contrail-openstack-packages
+package_type  = contrail-openstack-packages
 
 [contrail-openstack-analytics-deb]
 pkgs      = contrail-openstack-analytics
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-install-packages, contrail-openstack-packages
+package_type  = contrail-openstack-packages
 
 [contrail-openstack-config-deb]
 pkgs      = contrail-openstack-config
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-install-packages, contrail-openstack-packages
+package_type  = contrail-openstack-packages
 
 [contrail-openstack-control-deb]
 pkgs      = contrail-openstack-control
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-install-packages, contrail-openstack-packages
+package_type  = contrail-openstack-packages
 
 [contrail-openstack-database-deb]
 pkgs      = contrail-openstack-database
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-install-packages, contrail-openstack-packages
+package_type  = contrail-openstack-packages
 
 [contrail-openstack-vrouter-deb]
 pkgs      = contrail-openstack-vrouter
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-install-packages, contrail-openstack-packages
+package_type  = contrail-openstack-packages
 
 [contrail-openstack-webui-deb]
 pkgs      = contrail-openstack-webui
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-install-packages, contrail-openstack-packages
+package_type  = contrail-openstack-packages
 
 [ifmap-server]
 pkgs      = ifmap-server
@@ -117,7 +118,7 @@ builtloc  = build/packages
 [contrail-openstack-dashboard-deb]
 pkgs      = contrail-openstack-dashboard
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-install-packages, contrail-openstack-packages
+package_type  = contrail-openstack-packages
 
 [contrail-ostack-dashboard-deb]
 pkgs      = openstack-dashboard
@@ -131,11 +132,13 @@ makeloc   = tools/packaging/common/debian
 pkgs      = python-neutronclient
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [neutron-common-deb]
 pkgs      = neutron-common
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [neutron-plugin-contrail-deb]
 pkgs      = neutron-plugin-contrail
@@ -146,71 +149,91 @@ builtloc  = build/debian/
 pkgs      = neutron-server
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [python-neutron-deb]
 pkgs      = python-neutron
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-api-deb]
 pkgs      = nova-api
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-cells-deb]
 pkgs      = nova-cells
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-common-deb]
 pkgs      = nova-common
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-compute-deb]
 pkgs      = nova-compute
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-compute-kvm-deb]
 pkgs      = nova-compute-kvm
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-conductor-deb]
 pkgs      = nova-conductor
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-console-deb]
 pkgs      = nova-console
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-consoleauth-deb]
 pkgs      = nova-consoleauth
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-novncproxy-deb]
 pkgs      = nova-novncproxy
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-objectstore-deb]
 pkgs      = nova-objectstore
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [nova-scheduler-deb]
 pkgs      = nova-scheduler
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
 
 [python-nova-deb]
 pkgs      = python-nova
 makeloc   = tools/packaging/openstack/debian
 builtloc  = build/openstack/
+package_type  = contrail-openstack-packages
+
+[contrail-installer-package]
+pkgs         = contrail-installer-package
+makeloc      = tools/packaging/common/debian
+target       = contrail-installer-package-deb
+package_type  = contrail-installer-package
 
 [contrail-install-packages]
 pkgs         = contrail-install-packages
@@ -221,36 +244,36 @@ package_type  = contrail-install-packages
 [contrail-packages]
 pkgs      = contrail-packages
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-packages
+package_type  = contrail-packages, contrail-install-packages
 
 [contrail-thirdparty-packages]
 pkgs      = contrail-thirdparty-packages
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-thirdparty-packages
+package_type  = contrail-thirdparty-packages, contrail-install-packages
 
 [contrail-dependent-packages]
 pkgs      = contrail-dependent-packages
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-dependent-packages
+package_type  = contrail-dependent-packages, contrail-install-packages
 
 [contrail-openstack-packages]
 pkgs      = contrail-openstack-packages
 makeloc   = tools/packaging/common/debian
-package_type  = contrail-openstack-packages
+package_type  = contrail-openstack-packages, contrail-install-packages
 
 [openstack-default-target]
 pkgs         =
 makeloc      = tools/packaging/openstack/debian
 target       = all
 builtloc     = build/openstack/
-package_type = contrail-install-packages
+package_type = contrail-openstack-packages
 
 [contrail-default-target]
 pkgs         =
 makeloc      = tools/packaging/common/debian/
 target       = all
 builtloc     = build/debian/
-package_type = contrail-install-packages
+package_type = contrail-packages
 
 [contrail-openstack-ha-deb]
 pkgs      = contrail-openstack-ha