From cd04b3a645b17e22b64d29b3af3aaa9c407fc216 Mon Sep 17 00:00:00 2001 From: Jonh Wendell Date: Wed, 17 Jun 2015 09:49:58 -0300 Subject: [PATCH] EC2: Only install dhcpcd on releases before jessie Otherwise, keep Debian's default isc-dhcp-client, it works fine on EC2. --- bootstrapvz/providers/ec2/tasks/packages.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/bootstrapvz/providers/ec2/tasks/packages.py b/bootstrapvz/providers/ec2/tasks/packages.py index e02cd60..eab7b86 100644 --- a/bootstrapvz/providers/ec2/tasks/packages.py +++ b/bootstrapvz/providers/ec2/tasks/packages.py @@ -9,15 +9,13 @@ class DefaultPackages(Task): @classmethod def run(cls, info): info.packages.add('file') # Needed for the init scripts - # isc-dhcp-client doesn't work properly with ec2 - from bootstrapvz.common.releases import jessie - if info.manifest.release >= jessie: - info.packages.add('dhcpcd5') - else: - info.packages.add('dhcpcd') - info.exclude_packages.add('isc-dhcp-client') - info.exclude_packages.add('isc-dhcp-common') + # isc-dhcp-client before jessie doesn't work properly with ec2 + from bootstrapvz.common.releases import jessie + if info.manifest.release < jessie: + info.packages.add('dhcpcd') + info.exclude_packages.add('isc-dhcp-client') + info.exclude_packages.add('isc-dhcp-common') import os.path kernel_packages_path = os.path.join(os.path.dirname(__file__), 'packages-kernels.yml')