Merge pull request #228 from jwendell/get-rid-of-dhcpcd

EC2: Only install dhcpcd on releases before jessie
This commit is contained in:
Anders Ingemann 2015-06-17 15:19:55 +02:00
commit e0553ee80d

View file

@ -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')