Merge pull request #342 from JamesBromberger/master

Fix cloud-init config
This commit is contained in:
Anders Ingemann 2016-09-20 16:29:46 +02:00 committed by GitHub
commit aac1de39c6
3 changed files with 4 additions and 3 deletions

View file

@ -0,0 +1,2 @@
apt_preserve_sources_list: true
manage_etc_hosts: true

View file

@ -1 +0,0 @@
mount_default_fields: [ None, None, "auto", "defaults,nofail", "0", "2" ]

View file

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