Only include bare essential packages in the GCE provider task. Move

extras to the manifest files.

bootstrapvz/providers/gce/tasks/packages.py

@@ -27,11 +27,8 @@ class DefaultPackages(Task):
 		info.packages.add('python')
 		info.packages.add('openssh-client')
 		info.packages.add('openssh-server')
-		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,

manifests/official/gce/jessie-backports.yml

@@ -19,7 +19,11 @@ volume:
     root:
       filesystem: ext4
       size: 10GiB
-packages: {}
+packages:
+  install:
+    - rsync
+    - screen
+    - vim
 plugins:
   google_cloud_sdk: {}
   ntp:

manifests/official/gce/jessie.yml

@@ -19,7 +19,11 @@ volume:
     root:
       filesystem: ext4
       size: 10GiB
-packages: {}
+packages:
+  install:
+    - rsync
+    - screen
+    - vim
 plugins:
   google_cloud_sdk: {}
   ntp:

manifests/official/gce/wheezy-backports.yml

@@ -20,6 +20,10 @@ volume:
       filesystem: ext4
       size: 10GiB
 packages:
+  install:
+    - rsync
+    - screen
+    - vim
   preferences:
     backport-kernel:
     - package: linux-image-* initramfs-tools

manifests/official/gce/wheezy.yml

@@ -19,7 +19,11 @@ volume:
     root:
       filesystem: ext4
       size: 10GiB
-packages: {}
+packages:
+  install:
+    - rsync
+    - screen
+    - vim
 plugins:
   google_cloud_sdk: {}
   ntp: