Closes-Bug: #1691862 - Last set of missing packages for SM Xenial + C…

…hanged SM dependencies

The new SM dependencies are pacakges that are dependencies for SM lite but not SM
These were previously being installed from the postinst and have been removed from there

argparse and ordereddict python libraries come pre-installed with Python on 14.04 and 16.04

Patch 2:
Resolved merge conflicts with hardware discovery packaging change

Change-Id: I13021934479b69273e5a1c1614b7d6da7768c1f0

build/package_configs/ubuntu1604/newton/depends_contrail_dependent_packages.cfg

@@ -1161,7 +1161,7 @@ source         = repo:xenial-updates/main/
 file           = libtimedate-perl_2.3000-2_all.deb
 md5            = 709c24baede0981e7f3cfb96e8ee0229
 source         = repo:xenial/main/
-package_type = contrail-install-packages, contrail-dependent-packages, contrail-networking-dependents, contrail-kubernetes-dependents
+package_type = contrail-server-manager-installer, contrail-install-packages, contrail-dependent-packages, contrail-networking-dependents, contrail-kubernetes-dependents
 
 [libtbb2_4.4~20151115-0ubuntu3]
 file           = libtbb2_4.4~20151115-0ubuntu3_amd64.deb

build/package_configs/ubuntu1604/newton/depends_contrail_installer_packages.cfg

@@ -349,6 +349,7 @@ package_type   = contrail-install-packages, contrail-dependent-packages, contrai
 file           = python-all_2.7.11-1_amd64.deb
 md5            = bf338b9d5360ec685bfbf9a323afcf1e
 source         = repo:xenial/main/
+package_type   = contrail-install-packages, contrail-dependent-packages, contrail-installer-packages, contrail-server-manager-installer
 
 [python-apt_1.1.0~beta1build1]
 file           = python-apt_1.1.0~beta1build1_amd64.deb

build/package_configs/ubuntu1604/newton/depends_server_manager_packages.cfg

@@ -1061,3 +1061,82 @@ file           = ocl-icd-libopencl1_2.2.8-1_amd64.deb
 md5            = 826b33a573036e73f2173df18b4133a0
 source         = repo:xenial/main
 
+[server-mgr-bind9_1:9.10.3.dfsg.P4-8ubuntu1.5]
+file           = bind9_1%%3a9.10.3.dfsg.P4-8ubuntu1.5_amd64.deb
+md5            = 0d00ec5006fa3b91aec5aa66968505b9
+source         = repo:xenial-updates/main
+
+[server-mgr-bind9utils_1:9.10.3.dfsg.P4-8ubuntu1.5]
+file           = bind9utils_1%%3a9.10.3.dfsg.P4-8ubuntu1.5_amd64.deb
+md5            = dfdf0a8e78c174c519d4d31fdd60c17a
+source         = repo:xenial-updates/main
+
+[server-mgr-isc-dhcp-server_4.3.3-5ubuntu12.6]
+file           = isc-dhcp-server_4.3.3-5ubuntu12.6_amd64.deb
+md5            = 050af1427b9e3ec3092877e8cf33f89c
+source         = repo:xenial-updates/main
+
+[server-mgr-libencode-locale-perl_1.05-1]
+file           = libencode-locale-perl_1.05-1_all.deb
+md5            = 452574a48a280b12e98799dcef3980c1
+source         = repo:xenial/main
+
+[server-mgr-libhtml-parser-perl_3.72-1]
+file           = libhtml-parser-perl_3.72-1_amd64.deb
+md5            = 4a25b0a4982ecd3c565068092ee05929
+source         = repo:xenial/main
+
+[server-mgr-libhtml-tagset-perl_3.20-2]
+file           = libhtml-tagset-perl_3.20-2_all.deb
+md5            = 86862a4ac995db738fcfd012275fc3a7
+source         = repo:xenial/main
+
+[server-mgr-libhttp-date-perl_6.02-1]
+file           = libhttp-date-perl_6.02-1_all.deb
+md5            = 3aee8ce5ae257f3dfea03d2127dfc845
+source         = repo:xenial/main
+
+[server-mgr-libhttp-message-perl_6.11-1]
+file           = libhttp-message-perl_6.11-1_all.deb
+md5            = 91539b56b83117ec6238c002dc8b1631
+source         = repo:xenial/main
+
+[server-mgr-libio-html-perl_1.001-1]
+file           = libio-html-perl_1.001-1_all.deb
+md5            = b7b08a166142d14afdde49aca8e0f513
+source         = repo:xenial/main
+
+[server-mgr-libirs-export141_1:9.10.3.dfsg.P4-8ubuntu1.5]
+file           = libirs-export141_1%%3a9.10.3.dfsg.P4-8ubuntu1.5_amd64.deb
+md5            = 28353cdd35f977cb0f2a0bbe5dbd0976
+source         = repo:xenial-updates/main
+
+[server-mgr-libirs141_1:9.10.3.dfsg.P4-8ubuntu1.5]
+file           = libirs141_1%%3a9.10.3.dfsg.P4-8ubuntu1.5_amd64.deb
+md5            = 2ee51689f7c36f503359e8d88b3ecf5a
+source         = repo:xenial-updates/main
+
+[server-mgr-libisccfg-export140_1:9.10.3.dfsg.P4-8ubuntu1.5]
+file           = libisccfg-export140_1%%3a9.10.3.dfsg.P4-8ubuntu1.5_amd64.deb
+md5            = acff50ba354a012d70560b0b69dda8d5
+source         = repo:xenial-updates/main
+
+[server-mgr-liblwp-mediatypes-perl_6.02-1]
+file           = liblwp-mediatypes-perl_6.02-1_all.deb
+md5            = 654e7f05d341f4a859799eec9538b2c0
+source         = repo:xenial/main
+
+[server-mgr-libnet-libidn-perl_0.12.ds-2build2]
+file           = libnet-libidn-perl_0.12.ds-2build2_amd64.deb
+md5            = 40762ca3fe96b99e951e0d19d78fbd85
+source         = repo:xenial/main
+
+[server-mgr-liburi-perl_1.71-1]
+file           = liburi-perl_1.71-1_all.deb
+md5            = 678ed7bb65c65b03ba474302e61b9c26
+source         = repo:xenial/main
+
+[server-mgr-tftpd-hpa_5.2+20150808-1ubuntu1.16.04.1]
+file           = tftpd-hpa_5.2+20150808-1ubuntu1.16.04.1_amd64.deb
+md5            = 6a0a441bddac2117171a1c52180a96af
+source         = repo:xenial-updates/main

common/debian/contrail-server-manager/debian/control

@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8)
 Package: contrail-server-manager
 Architecture: all
 Maintainer: tsurendra <tsurendra@juniper.net>
-Depends: python , apache2, sqlite, cobbler (=2.6.11-1), puppetmaster-passenger (=3.8.5-2), puppetmaster-common (=3.8.5-2), xinetd, python-pip, python-gevent, isc-dhcp-server, ntp,autoconf, gcc, bind9, tftp, sendmail, dpkg-dev, syslinux, ipmitool, createrepo, libapache2-mod-wsgi, tftpd-hpa, python-urlgrabber, python-django, selinux-utils, python-simplejson, python-dev, fence-agents, python-requests, reprepro, python-netaddr, python-contrail, python-paste, docker-engine, ansible, python-urllib3 (=1.15.1-2~cloud0), python-ipaddress, python-websocket, python-docker, ceph-common
+Depends: python , apache2, sqlite, cobbler (=2.6.11-1), puppetmaster-passenger (=3.8.5-2), puppetmaster-common (=3.8.5-2), xinetd, python-pip, python-gevent, isc-dhcp-server, ntp,autoconf, gcc, bind9, tftp, sendmail, dpkg-dev, syslinux, ipmitool, createrepo, libapache2-mod-wsgi, tftpd-hpa, python-urlgrabber, python-django, selinux-utils, python-simplejson, python-dev, fence-agents, python-requests, reprepro, python-netaddr, python-contrail, python-paste, docker-engine, ansible, python-urllib3 (=1.15.1-2~cloud0), python-ipaddress, python-websocket, python-docker, ceph-common, python-yaml, libnss3-1d, python-paramiko, python-xmltodict, python-pycurl, python-crypto
 Section: contrail-server-manager
 Priority: extra
 Description: Contrail Server Manager - Server Package

common/debian/contrail-server-manager/debian/postinst

@@ -22,15 +22,7 @@ SUBNET_MASK=`ifconfig -a | grep $HOST_IP -b4 | grep Mask | awk '{print $5}' | cu
 DOMAIN=`hostname -d`
 rel=`lsb_release -r`
 
-# Stage I - Install required packages
-easy_install argparse
-easy_install paramiko==1.17.0
-easy_install pycrypto
-easy_install ordereddict
-easy_install pycurl
-pip install xmltodict
-
-# Stage 2: Copy config files into place
+# Copy config files into place
 
 # Copy cobbler pxesystem template file for esxi
 mv /etc/cobbler/pxe/pxesystem_esxi.template /etc/cobbler/pxe/pxesystem_esxi.template-save