From 74a8aae6acdf908559dba6b68195983177d50f93 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Fri, 26 Feb 2016 16:24:20 -0800 Subject: [PATCH 1/2] 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, From c34d7d11c8046ba68a733788e08f072c12621c97 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Mon, 29 Feb 2016 10:38:34 -0800 Subject: [PATCH 2/2] Only include bare essential packages in the GCE provider task. Move extras to the manifest files. --- bootstrapvz/providers/gce/tasks/packages.py | 3 --- manifests/official/gce/jessie-backports.yml | 6 +++++- manifests/official/gce/jessie.yml | 6 +++++- manifests/official/gce/wheezy-backports.yml | 4 ++++ manifests/official/gce/wheezy.yml | 6 +++++- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/bootstrapvz/providers/gce/tasks/packages.py b/bootstrapvz/providers/gce/tasks/packages.py index 208b0c9..4aa775d 100644 --- a/bootstrapvz/providers/gce/tasks/packages.py +++ b/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, diff --git a/manifests/official/gce/jessie-backports.yml b/manifests/official/gce/jessie-backports.yml index 45b7e05..a10b167 100644 --- a/manifests/official/gce/jessie-backports.yml +++ b/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: diff --git a/manifests/official/gce/jessie.yml b/manifests/official/gce/jessie.yml index 45b7e05..a10b167 100644 --- a/manifests/official/gce/jessie.yml +++ b/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: diff --git a/manifests/official/gce/wheezy-backports.yml b/manifests/official/gce/wheezy-backports.yml index c8a79b8..b938234 100644 --- a/manifests/official/gce/wheezy-backports.yml +++ b/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 diff --git a/manifests/official/gce/wheezy.yml b/manifests/official/gce/wheezy.yml index c8dd149..cc3e593 100644 --- a/manifests/official/gce/wheezy.yml +++ b/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: