Pacakage contrail pacakges and thirdparty depends packages seperately

build/libs/packager/utils.py

@@ -318,15 +318,18 @@ def update_repoinfo(self, *pkgcfgs):
             for pkg in pkgcfg.keys():
                 pkgcfg[pkg]['repo'] = self.repo_dir
 
-    @staticmethod
-    def get_dict_by_item(tdict, titem):
+    def get_dict_by_item(self, tdict, titem):
+        '''converts a given dict with given items as keys
+        '''
         matrix = {}
         cfg_itemgetter = operator.itemgetter(titem)
         for key, items in tdict.items():
-            matrix_key = cfg_itemgetter(items)
-            if not matrix.has_key(matrix_key):
-                matrix[matrix_key] = {}
-            matrix[matrix_key].update({key: items})
+            matrix_keys = cfg_itemgetter(items)
+            matrix_keys = self.get_as_list(matrix_keys)
+            for matrix_key in matrix_keys:
+                if not matrix.has_key(matrix_key):
+                    matrix[matrix_key] = {}
+                matrix[matrix_key].update({key: items})
         return matrix
 
     def copy_pkg_files(self, pkginfo, error=True):

build/package_configs/centos64/grizzly/base_packages.cfg

@@ -14,7 +14,7 @@
 file          =
 md5           =
 location      = 
-package_type  = contrail-install-packages
+package_type  = contrail-thirdparty-packages
 
 [busybox]
 file  = busybox-1.15.1-15.el6.x86_64.rpm
@@ -191,6 +191,7 @@ md5   = f1cc9be2415c339c34d25859713524fd
 [python-libs]
 file  = python-libs-2.6.6-36.el6.x86_64.rpm
 md5   = 7fab78cc404d664c6d1b3ad6bdf9cc55
+package_type = contrail-install-packages
 
 [libxcb]
 file  = libxcb-1.8.1-1.el6.x86_64.rpm
@@ -403,6 +404,7 @@ md5   = e8846e8f42eb877abc2fce1c8bd2f0e9
 [python]
 file  = python-2.6.6-36.el6.x86_64.rpm
 md5   = b5a4f61795e5b528c4eaf7228c5de3da
+package_type = contrail-install-packages
 
 [iwl3945-firmware-15]
 file  = iwl3945-firmware-15.32.2.9-4.el6.noarch.rpm
@@ -463,6 +465,7 @@ md5   = 8243119d7d4d578fdc780161ee286eff
 [libgcc]
 file  = libgcc-4.4.7-3.el6.x86_64.rpm
 md5   = 5fac9df2b48d0ac91d247476c6366b63
+package_type = contrail-install-packages
 
 [efibootmgr]
 file  = efibootmgr-0.5.4-10.el6.x86_64.rpm
@@ -499,6 +502,7 @@ md5   = 5cf74fcbb754ef0bd054aa8f5f23e781
 [glibc-common]
 file  = glibc-common-2.12-1.107.el6.x86_64.rpm
 md5   = 5608b1be8bd3c4d7c9f95b02780af7d5
+package_type = contrail-install-packages
 
 [ncurses-libs]
 file  = ncurses-libs-5.7-3.20090208.el6.x86_64.rpm
@@ -527,6 +531,7 @@ md5   = 1b494b261f0f8793012cd5a982d110be
 [openssl]
 file  = openssl-1.0.0-27.el6.x86_64.rpm
 md5   = 0263f276e14100d693612a084b81c777
+package_type = contrail-install-packages
 
 [iwl5000-firmware]
 file  = iwl5000-firmware-8.83.5.1_1-1.el6_1.1.noarch.rpm
@@ -1579,3 +1584,4 @@ md5   = 52a9d21922ca00962fc3e287b86de51c
 [glibc]
 file  = glibc-2.12-1.107.el6.x86_64.rpm
 md5   = b73f6a0a44d1335f0ea6ca484b66f762
+package_type = contrail-install-packages

build/package_configs/centos64/grizzly/contrail_packages.cfg

@@ -259,10 +259,19 @@ makeloc   = tools/packaging/openstack/centos_64
 pkgs      = openstack-quantum, python-quantum, openstack-quantum-contrail
 makeloc   = tools/packaging/openstack/centos_64
 
+[contrail-nodemgr]
+pkgs	  = contrail-nodemgr
+makeloc   = tools/packaging/common/rpm 
+
 [contrail-install-packages]
 pkgs      = contrail-install-packages
 makeloc   = tools/packaging/common/rpm
 
+[contrail-thirdparty-packages]
+pkgs          = contrail-thirdparty-packages
+makeloc       = tools/packaging/common/rpm
+package_type  = contrail-thirdparty-packages
+
 [thirdparty-default-target]
 pkgs      =
 makeloc   = tools/packaging/third_party/
@@ -277,7 +286,3 @@ target    = all
 pkgs      =
 makeloc   = tools/packaging/openstack/centos_64
 target    = all
-
-[contrail-nodemgr]
-pkgs	  = contrail-nodemgr
-makeloc   = tools/packaging/common/rpm 

build/package_configs/centos64/grizzly/depends_packages.cfg

@@ -14,7 +14,7 @@
 md5          =
 file         =
 location     = 
-package_type = contrail-install-packages
+package_type = contrail-thirdparty-packages
 
 [python-routes]
 file  = python-routes-1.12-3.noarch.rpm
@@ -191,6 +191,7 @@ md5   = fc7a72ac763a0e42fbb5efd459428a50
 [python-setuptools]
 file  = python-setuptools-0.6.10-3.el6.noarch.rpm
 md5   = e00e7bd03739b7a1d67160ae42bfd365
+package_type = contrail-install-packages
 
 [boost-devel]
 file  = boost-devel-1.41.0-17.el6_4.x86_64.rpm
@@ -295,6 +296,7 @@ md5   = 4b2d7a8e456553708caadff14e8593e4
 [python-netaddr]
 file  = python-netaddr-0.7.5-4.el6.noarch.rpm
 md5   = 4154369058390ca392e65ca77f3bc0f3
+package_type = contrail-install-packages
 
 [libXfont]
 file  = libXfont-1.4.5-2.el6.x86_64.rpm
@@ -315,6 +317,7 @@ md5   = e85d23d6c48fa6617a2bc89847bdffbb
 [gdb]
 file  = gdb-7.2-60.el6_4.1.x86_64.rpm
 md5   = d4822fdada0f37ad97c0b3ff31d8ed3a
+package_type = contrail-install-packages
 
 [python-requests]
 file  = python-requests-1.1.0-3.el6.noarch.rpm
@@ -479,6 +482,7 @@ md5   = b2a5327458e7942480ff754c8508c9fd
 [kernel-headers]
 file  = kernel-headers-2.6.32-358.11.1.el6.x86_64.rpm
 md5   = 4b22a87a61351956718b356c4f9cd417
+package_type = contrail-install-packages
 
 [btrfs-progs]
 file  = btrfs-progs-0.20-0.2.git91d9eec.el6.x86_64.rpm
@@ -639,6 +643,7 @@ md5   = 62fe935e8d6a978d9856379c0915f9f4
 [openstack-utils-2013]
 file  = openstack-utils-2013.1-7.el6.noarch.rpm
 md5   = 5c0a717b8b6b1c73077651adde110bf2
+package_type = contrail-install-packages
 
 [xml-commons-resolver]
 file  = xml-commons-resolver-1.1-4.18.el6.x86_64.rpm
@@ -675,6 +680,7 @@ md5   = ae96ca52af388833201c5a811947d98e
 [glibc-headers]
 file  = glibc-headers-2.12-1.107.el6.x86_64.rpm
 md5   = 2a23ef15c19ca3a44c93abb5e1af555a
+package_type = contrail-install-packages
 
 [usermode-gtk]
 file  = usermode-gtk-1.102-3.el6.x86_64.rpm
@@ -719,6 +725,7 @@ md5   = 06df0aa4aeb9cde33974de5b425828c2
 [ppl]
 file  = ppl-0.10.2-11.el6.x86_64.rpm
 md5   = 248fd5af655e66af417992c726ffb45c
+package_type = contrail-install-packages
 
 [libtool-ltdl]
 file  = libtool-ltdl-2.2.6-15.5.el6.x86_64.rpm
@@ -835,6 +842,7 @@ md5   = db0eab9a496d934bcd78c923296558e1
 [cloog-ppl]
 file  = cloog-ppl-0.15.7-1.2.el6.x86_64.rpm
 md5   = fb0fd43ad45c05f78c67e39ed274df7e
+package_type = contrail-install-packages
 
 [spice-server]
 file  = spice-server-0.12.0-12.el6_4.1.x86_64.rpm
@@ -961,8 +969,9 @@ file  = avahi-autoipd-0.6.25-12.el6.x86_64.rpm
 md5   = fba319c70b532175664759a137577fed
 
 [python-pip]
-file  = python-pip-1.3.1-1.el6.noarch.rpm
-md5   = 11aade49712d4cd94d64aff8241622a5
+file         = python-pip-1.3.1-1.el6.noarch.rpm
+md5          = 11aade49712d4cd94d64aff8241622a5
+package_type = contrail-install-packages
 
 [boost-program-options]
 file  = boost-program-options-1.41.0-17.el6_4.x86_64.rpm
@@ -1083,10 +1092,12 @@ md5   = d14904005982c71a8f33340082d4146b
 [glibc-devel]
 file  = glibc-devel-2.12-1.107.el6.x86_64.rpm
 md5   = 4405c8b28e87bc9c7ed5824c271cc381
+package_type = contrail-install-packages
 
 [gcc]
 file  = gcc-4.4.7-3.el6.x86_64.rpm
 md5   = f4ed3e065e2e855974544c7793eb814b
+package_type = contrail-install-packages
 
 [python-six]
 file  = python-six-1.1.0-2.el6.noarch.rpm
@@ -1099,6 +1110,7 @@ md5   = 7e861daa47ecabde9ad3c10fbcb08ad6
 [python-argparse]
 file  = python-argparse-1.2.1-2.el6.noarch.rpm
 md5   = 68d75eb21ff03c204e9f9ef3cba74c3e
+package_type = contrail-install-packages
 
 [libreport-newt]
 file  = libreport-newt-2.0.9-15.el6.centos.x86_64.rpm
@@ -1115,6 +1127,7 @@ md5   = 66df1ddfa1a1296416a4f3c40adfba3d
 [python-devel]
 file  = python-devel-2.6.6-36.el6.x86_64.rpm
 md5   = b1edf68117328a3e2e7e9a48261a6a7a
+package_type = contrail-install-packages
 
 [python-django-appconf]
 file  = python-django-appconf-0.5-2.el6.noarch.rpm
@@ -1259,6 +1272,7 @@ md5   = 41901435b2496830b9ae631958bb624d
 [libgomp]
 file  = libgomp-4.4.7-3.el6.x86_64.rpm
 md5   = c903d08e74fb1fe8ad98d149aa2be9d2
+package_type = contrail-install-packages
 
 [vgabios]
 file  = vgabios-0.6b-3.7.el6.noarch.rpm
@@ -1327,10 +1341,12 @@ md5   = 41edac929c33f7145d361591eb3af1b6
 [python-netifaces]
 file  = python-netifaces-0.5-1.el6.x86_64.rpm
 md5   = 248e1b9b853bda52114791bf0600f8da
+package_type = contrail-install-packages
 
 [cpp]
 file  = cpp-4.4.7-3.el6.x86_64.rpm
 md5   = b061c0a095c0f3c3a2bf70ff6a763424
+package_type = contrail-install-packages
 
 [cracklib-python]
 file  = cracklib-python-2.8.16-4.el6.x86_64.rpm
@@ -1339,6 +1355,7 @@ md5   = f6902845b64561e632a6730fcc2c42c7
 [mpfr]
 file  = mpfr-2.4.1-6.el6.x86_64.rpm
 md5   = c9b194bb693cae173c06a7dea19f3bd7
+package_type = contrail-install-packages
 
 [libuv]
 file  = libuv-0.10.5-1.el6.x86_64.rpm
@@ -1547,6 +1564,7 @@ md5  = c6e10baa3955bb7fd3f335182389a6ec
 [make]
 file = make-3.81-20.el6.x86_64.rpm
 md5  = 556348c198696e9edbf77c71c5fbc601
+package_type = contrail-install-packages
 
 [mesa-dri1-drivers]
 file = mesa-dri1-drivers-7.11-8.el6.x86_64.rpm
@@ -1595,6 +1613,7 @@ md5  = df244d55c46e20a7de47c3a58c6f0869
 [openssl]
 file = openssl-1.0.1e-16.el6_5.7.x86_64.rpm
 md5  = 4d13d3df8275165f778e8d024506505f
+package_type = contrail-install-packages
 
 [rabbitmq-server]
 file = rabbitmq-server-3.2.2-1.noarch.rpm

build/package_configs/centos64/havana/contrail_packages.cfg

@@ -224,10 +224,19 @@ makeloc   = tools/packaging/openstack/centos_64
 pkgs      = contrail-openstack-dashboard
 makeloc   = tools/packaging/openstack/centos_64
 
+[contrail-nodemgr]
+pkgs	  = contrail-nodemgr
+makeloc   = tools/packaging/common/rpm 
+
 [contrail-install-packages]
 pkgs      = contrail-install-packages
 makeloc   = tools/packaging/common/rpm
 
+[contrail-thirdparty-packages]
+pkgs          = contrail-thirdparty-packages
+makeloc       = tools/packaging/common/rpm
+package_type  = contrail-thirdparty-packages
+
 [thirdparty-default-target]
 pkgs      =
 makeloc   = tools/packaging/third_party/
@@ -242,7 +251,3 @@ target    = all
 pkgs      =
 makeloc   = tools/packaging/openstack/centos_64
 target    = all
-
-[contrail-nodemgr]
-pkgs	  = contrail-nodemgr
-makeloc   = tools/packaging/common/rpm