From 74a8aae6acdf908559dba6b68195983177d50f93 Mon Sep 17 00:00:00 2001
From: Zach Marano <zmarano@google.com>
Date: Fri, 26 Feb 2016 16:24:20 -0800
Subject: [PATCH] Cleanup package list and add in packages that were being
 added outside of bootstrap-vz. Remove i386 kernels that GCE does not support
 as well as squeeze, and add in a stretch kernel.

---
 .../providers/gce/tasks/packages-kernels.yml  |  8 ++-----
 bootstrapvz/providers/gce/tasks/packages.py   | 21 +++++++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bootstrapvz/providers/gce/tasks/packages-kernels.yml b/bootstrapvz/providers/gce/tasks/packages-kernels.yml
index 1d5a4a0..5ba8f76 100644
--- a/bootstrapvz/providers/gce/tasks/packages-kernels.yml
+++ b/bootstrapvz/providers/gce/tasks/packages-kernels.yml
@@ -1,14 +1,10 @@
 ---
 # This is a mapping of Debian release codenames to processor architectures to kernel packages
-squeeze: # In squeeze, we need a special kernel flavor for xen
-  amd64: linux-image-xen-amd64
-  i386: linux-image-xen-686
 wheezy:
   amd64: linux-image-amd64
-  i386: linux-image-686
 jessie:
   amd64: linux-image-amd64
-  i386: linux-image-686-pae
+stretch:
+  amd64: linux-image-amd64
 sid:
   amd64: linux-image-amd64
-  i386: linux-image-686-pae
diff --git a/bootstrapvz/providers/gce/tasks/packages.py b/bootstrapvz/providers/gce/tasks/packages.py
index da4b260..208b0c9 100644
--- a/bootstrapvz/providers/gce/tasks/packages.py
+++ b/bootstrapvz/providers/gce/tasks/packages.py
@@ -14,15 +14,24 @@ class DefaultPackages(Task):
 
 	@classmethod
 	def run(cls, info):
-		info.packages.add('python')
-		info.packages.add('sudo')
-		info.packages.add('ntp')
-		info.packages.add('lsb-release')
 		info.packages.add('acpi-support-base')
+		info.packages.add('ca-certificates')
+		info.packages.add('curl')
+		info.packages.add('ethtool')
+		info.packages.add('gdisk')
+		info.packages.add('kpartx')
+		info.packages.add('isc-dhcp-client')
+		info.packages.add('lsb-release')
+		info.packages.add('ntp')
+		info.packages.add('parted')
+		info.packages.add('python')
 		info.packages.add('openssh-client')
 		info.packages.add('openssh-server')
-		info.packages.add('dhcpd')
-		info.packages.add('ca-certificates')
+		info.packages.add('rsync')
+		info.packages.add('screen')
+		info.packages.add('sudo')
+		info.packages.add('uuid-runtime')
+		info.packages.add('vim')
 
 		kernel_packages_path = os.path.join(os.path.dirname(__file__), 'packages-kernels.yml')
 		kernel_package = config_get(kernel_packages_path, [info.manifest.release.codename,