From 6b4e90fd4d3adb2216408c6ce058a671296bc414 Mon Sep 17 00:00:00 2001
From: nitishkrishna <nitishk@juniper.net>
Date: Fri, 20 Feb 2015 06:34:46 -0800
Subject: [PATCH] Closes-Bug: #1420927 - Changing sources.list to minimum
 required lines (No internet repos)

This check-in:
 - Reduces the sources.list on target nodes to few lines
 - These lines are: thirdparty packages repo and contrail packages repo on SM
 - Local repo with same packages as contrail repo
 - Tested on Vinod's setup  - both 12.04.3 and 14.04.1

Change-Id: I4c7f76f0e29edb7e470956209e82e6614fdb76f4
---
 src/kickstarts/contrail-ubuntu.ks        |  7 +++++++
 src/kickstarts/contrail-ubuntu_trusty.ks | 11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/kickstarts/contrail-ubuntu.ks b/src/kickstarts/contrail-ubuntu.ks
index 4820a5dc..9c4994dc 100755
--- a/src/kickstarts/contrail-ubuntu.ks
+++ b/src/kickstarts/contrail-ubuntu.ks
@@ -37,10 +37,17 @@ EOF
 # Update sources.list so that ubuntu repo is available to download all
 # dependencies needed by puppet such as ruby, puppet-common etc.
 # add repos needed for puppet and its dependencies
+mv /etc/apt/sources.list /etc/apt/sources.list.bk
+touch /etc/apt/sources.list
 
 cat >>/etc/apt/sources.list <<EOF
 # add repos needed for puppet and its dependencies
 deb http://$server/thirdparty_packages/ ./
+EOF
+
+cat >>/etc/apt/sources.list.save <<EOF
+# add repos needed for puppet and its dependencies
+deb http://$server/thirdparty_packages/ ./
 
 # deb cdrom:[Ubuntu-Server 12.04 LTS _Precise Pangolin_ - Release amd64 (20120424.1)]/ dists/precise/main/binary-i386/
 # deb cdrom:[Ubuntu-Server 12.04 LTS _Precise Pangolin_ - Release amd64 (20120424.1)]/ dists/precise/restricted/binary-i386/
diff --git a/src/kickstarts/contrail-ubuntu_trusty.ks b/src/kickstarts/contrail-ubuntu_trusty.ks
index 9bf2c27e..f225b76d 100755
--- a/src/kickstarts/contrail-ubuntu_trusty.ks
+++ b/src/kickstarts/contrail-ubuntu_trusty.ks
@@ -49,14 +49,19 @@ service ssh restart
 
 mv /etc/apt/sources.list /etc/apt/sources.list.orig
 
-echo "deb http://$server/thirdparty_packages/ ./" > /etc/apt/sources.list
+#echo "deb http://$server/thirdparty_packages/ ./" > /etc/apt/sources.list
+touch /etc/apt/sources.list
+cat >>/etc/apt/sources.list <<EOF
+# add repos needed for puppet and its dependencies
+deb http://$server/thirdparty_packages/ ./
+EOF
 
 apt-get update
 apt-get -y install puppet
 
-cp /etc/apt/sources.list.orig /etc/apt/sources.list
+#cp /etc/apt/sources.list.orig /etc/apt/sources.list
 
-cat >>/etc/apt/sources.list <<EOF
+cat >>/etc/apt/sources.list.save <<EOF
 # add repos needed for puppet and its dependencies
 deb http://$server/thirdparty_packages/ ./