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

Process cloud config tasks only if they are configured.

Browse source
This commit is contained in:
James Bromberger 2013-12-25 12:47:17 +00:00
parent 7e3527d2af
commit 39f5e815b8
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/cloud_init/__init__.py
View file

@ -27,7 +27,16 @@ def resolve_tasks(tasklist, manifest):
from tasks import DisableModules from tasks import DisableModules
from providers.ec2.tasks.initd import AddEC2InitScripts from providers.ec2.tasks.initd import AddEC2InitScripts
from common.tasks import initd from common.tasks import initd
tasklist.add(SetUsername, AutoSetMetadataSource, SetMetadataSource, DisableModules)
options = manifest.plugins['cloud_init']
tasklist.add(AutoSetMetadataSource)
if 'username' in options:
tasklist.add(SetUsername)
if 'disable_modules' in options:
tasklist.add(DisableModules)
if 'metadata_sources' in options:
tasklist.add(SetMetadataSource)
tasklist.remove(AddEC2InitScripts, tasklist.remove(AddEC2InitScripts,
initd.AddExpandRoot, initd.AddExpandRoot,
initd.AdjustExpandRootScript, initd.AdjustExpandRootScript,

10
plugins/cloud_init/tasks.py
View file

@ -68,9 +68,13 @@ class DisableModules(Task):
patterns = patterns + ")$" patterns = patterns + ")$"
regex = re.compile(patterns) regex = re.compile(patterns)
f = open(info.root + "/etc/cloud/cloud.cfg") try:
lines = f.readlines() f = open(info.root + "/etc/cloud/cloud.cfg")
f.close() lines = f.readlines()
f.close()
except:
print "Cannot read cloud.cfg"
return -1
f = open(info.root + "/etc/cloud/cloud.cfg", "w") f = open(info.root + "/etc/cloud/cloud.cfg", "w")
for line in lines: for line in lines: