Closes-Bug: #1495739 - Puppet config should come in with installer fo…

…r cert gen

Without the correct conf, the new certs generated for puppet master will not have DNS alt names as puppet
This will cause provisioning to fail for SM as well as SM LITE

Change-Id: I49f3c92e8d9e569ef417f56d0b72573d159564f7

build/deb_server_manager_setup.sh

@@ -219,7 +219,9 @@ if [ "$SM" != "" ]; then
     apt-get --no-install-recommends -y install libpython2.7=2.7.6-8ubuntu0.2 >> $log_file 2>&1
   fi
   apt-get -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install puppet-common="3.7.3-1puppetlabs1" puppetmaster-common="3.7.3-1puppetlabs1" >> $log_file 2>&1
+  cp /opt/contrail/contrail_server_manager/puppet.conf /etc/puppet/
   apt-get -y --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" install nodejs=0.8.15-1contrail1 >> $log_file 2>&1
+
   if [ "$CERT_NAME" != "" ]; then
     host=$CERT_NAME
     echo "$space$arrow Creating puppet certificate with name $host"

common/debian/contrail-server-manager-installer/debian/rules

@@ -74,7 +74,7 @@ override_dh_auto_install:
 	install -p -m 755 $(SB_TOP)/tools/packaging/build/cobbler_web.conf  $(buildroot)$(_contrailopt)/contrail_server_manager/cobbler_web.conf
 	install -p -m 755 $(SB_TOP)/tools/packaging/build/cobbler_14.conf  $(buildroot)$(_contrailopt)/contrail_server_manager/cobbler_14.conf
 	install -p -m 755 $(SB_TOP)/tools/packaging/build/cobbler_web_14.conf  $(buildroot)$(_contrailopt)/contrail_server_manager/cobbler_web_14.conf
-
+	cp $(src_path)/puppet/puppet.conf $(buildroot)$(_contrailopt)/contrail_server_manager/puppet.conf
 	# install TGZ file and packages list file
 	if [ -f $(TGZ_FILE) ]; then echo "Using TGZ FILE = $(TGZ_FILE)"; install -p -m 644 $(TGZ_FILE) $(buildroot)$(_contrailopt)/contrail_server_manager/contrail_server_manager_packages.tgz; else echo "ERROR: TGZ file containing all debs is not supplied or not present"; echo "Supply Argument: FILE_LIST=<TGZ FILE>"; exit 1; fi
 override_dh_shlibdeps: