From 97c03a85f3e8e71b1c2cad10ca71ba598115521b Mon Sep 17 00:00:00 2001 From: James Bromberger Date: Mon, 19 Sep 2016 15:42:52 +0000 Subject: [PATCH] Rename debiancloud.conf to .cfg to match cloud-init requirements. --- bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg | 3 ++- bootstrapvz/providers/ec2/tasks/tuning.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg b/bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg index ed427ed..992b775 100644 --- a/bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg +++ b/bootstrapvz/providers/ec2/assets/cloud-init/debian_cloud.cfg @@ -1 +1,2 @@ -mount_default_fields: [ None, None, "auto", "defaults,nofail", "0", "2" ] +apt_preserve_sources_list: true +manage_etc_hosts: true diff --git a/bootstrapvz/providers/ec2/tasks/tuning.py b/bootstrapvz/providers/ec2/tasks/tuning.py index 0638a0e..a360092 100644 --- a/bootstrapvz/providers/ec2/tasks/tuning.py +++ b/bootstrapvz/providers/ec2/tasks/tuning.py @@ -23,8 +23,8 @@ class SetCloudInitMountOptions(Task): @classmethod def run(cls, info): - cloud_init_src = os.path.join(assets, 'cloud-init/debian_cloud.conf') - cloud_init_dst = os.path.join(info.root, 'etc/cloud/cloud.cfg.d/01_debian_cloud.conf') + cloud_init_src = os.path.join(assets, 'cloud-init/debian_cloud.cfg') + cloud_init_dst = os.path.join(info.root, 'etc/cloud/cloud.cfg.d/01_debian_cloud.cfg') copy(cloud_init_src, cloud_init_dst) os.chmod(cloud_init_dst, 0644)