From ee64a878890e3aa128f07a1bad38e4a1f59b4001 Mon Sep 17 00:00:00 2001 From: Marcin Kulisz Date: Tue, 20 Sep 2016 16:36:51 +0100 Subject: [PATCH] Stretch (9.0) patch #2 - EC2: Removing backports + if release >= jessie and not stable --- bootstrapvz/providers/ec2/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py index 6b53e9d..3728cb3 100644 --- a/bootstrapvz/providers/ec2/__init__.py +++ b/bootstrapvz/providers/ec2/__init__.py @@ -49,7 +49,7 @@ def validate_manifest(data, validator, error): def resolve_tasks(taskset, manifest): - from bootstrapvz.common.releases import wheezy, jessie + from bootstrapvz.common.releases import wheezy, jessie, stable taskset.update(task_groups.get_standard_groups(manifest)) taskset.update(task_groups.ssh_group) @@ -80,12 +80,13 @@ def resolve_tasks(taskset, manifest): taskset.add(tasks.network.EnableDHCPCDDNS) if manifest.release >= jessie: - taskset.add(apt.AddBackports) taskset.add(tasks.tuning.SetCloudInitMountOptions) taskset.add(tasks.packages.AddWorkaroundGrowpart) taskset.add(initd.AdjustGrowpartWorkaround) if manifest.system['bootloader'] == 'grub': taskset.add(grub.EnableSystemd) + if manifest.release == stable: + taskset.add(apt.AddBackports) if manifest.provider.get('install_init_scripts', True): taskset.add(tasks.initd.AddEC2InitScripts)