kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 07:26:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust run ordering of cloud-init config.

Browse source
This commit is contained in:
James Bromberger 2013-12-19 14:21:33 +00:00
parent 02ef8cabb8
commit e17bc7ec73
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/cloud_init/tasks.py
View file

@ -45,6 +45,7 @@ class AutoSetMetadataSource(Task):
sources = "Ec2"
if sources:
print ("Setting metadata source to " + sources)
sources = "cloud-init cloud-init/datasources multiselect " + sources
log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/debconf-set-selections' ], sources)
@ -54,6 +55,7 @@ class DisableModules(Task):
predecessors = [apt.AptUpgrade]
def run(self, info):
if 'disable_modules' in info.manifest.plugins['cloud_init']:
patterns = ""
for pattern in info.manifest.plugins['cloud_init']['disable_modules']:
if patterns != "":
@ -67,7 +69,6 @@ class DisableModules(Task):
lines = f.readlines()
f.close()
print("Pattern to match is " + patterns + "\n")
f = open(info.root + "/etc/cloud/cloud.cfg", "w")
for line in lines:
if not regex.match(line):