diff options
| -rw-r--r-- | doc/examples/part-handler.txt | 12 | ||||
| -rw-r--r-- | ec2init/UserDataHandler.py | 3 | ||||
| -rw-r--r-- | ec2init/__init__.py | 33 | ||||
| -rwxr-xr-x | tools/write-mime-multipart | 3 |
4 files changed, 45 insertions, 6 deletions
diff --git a/doc/examples/part-handler.txt b/doc/examples/part-handler.txt new file mode 100644 index 00000000..1fe37f3a --- /dev/null +++ b/doc/examples/part-handler.txt @@ -0,0 +1,12 @@ +#part-handler +# vi: syntax=python ts=4 + +def list_types(): + return(["text/plain", "text/go-cubs-go"]) + +def handle_part(data,ctype,filename,payload): + if ctype == "__end__" or ctype == "__begin__": return + + print "==== received ctype=%s filename=%s ====" % (ctype,filename) + print payload + print "==== end ctype=%s filename=%s" % (ctype, filename) diff --git a/ec2init/UserDataHandler.py b/ec2init/UserDataHandler.py index f7c0e214..56feb0ff 100644 --- a/ec2init/UserDataHandler.py +++ b/ec2init/UserDataHandler.py @@ -8,7 +8,8 @@ starts_with_mappings={ '#include' : 'text/x-include-url', '#!' : 'text/x-shellscript', '#cloud-config' : 'text/cloud-config', - '#upstart-job' : 'text/upstart-job' + '#upstart-job' : 'text/upstart-job', + '#part-handler' : 'text/part-handler' } # if 'str' is compressed return decompressed otherwise return it diff --git a/ec2init/__init__.py b/ec2init/__init__.py index 5405b5e4..b88e3ddd 100644 --- a/ec2init/__init__.py +++ b/ec2init/__init__.py @@ -30,6 +30,7 @@ import yaml datadir = '/var/lib/cloud/data' semdir = '/var/lib/cloud/sem' +pluginsdir = datadir + '/plugins' cachedir = datadir + '/cache' userdata_raw = datadir + '/user-data.txt' userdata = datadir + '/user-data.txt.i' @@ -228,13 +229,37 @@ class EC2Init: func(data,"__end__",None,None) def handle_handler(self,data,ctype,filename,payload): - if ctype == "__begin__" or ctype == "__end__": return + if ctype == "__end__": return + if ctype == "__begin__" : + self.handlercount = 0 + return + + # add the path to the plugins dir to the top of our list for import + if self.handlercount == 0: + sys.path.insert(0,pluginsdir) + + self.handlercount=self.handlercount+1 + + # write content to pluginsdir + modname = 'part-handler-%03d' % self.handlercount + modfname = modname + ".py" + util.write_file("%s/%s" % (pluginsdir,modfname), payload, 0600) + + try: + mod = __import__(modname) + lister = getattr(mod, "list_types") + handler = getattr(mod, "handle_part") + except: + import traceback + traceback.print_exc(file=sys.stderr) + return - # - do something to include the handler, ie, eval it or something # - call it with '__begin__' + handler(data, "__begin__", None, None) + # - add it self.part_handlers - # self.part_handlers['new_type']=handler - print "Do not know what to do with a handler yet, sorry" + for mtype in lister(): + self.part_handlers[mtype]=handler def handle_user_script(self,data,ctype,filename,payload): if ctype == "__end__": return diff --git a/tools/write-mime-multipart b/tools/write-mime-multipart index b83073c1..d7ce0992 100755 --- a/tools/write-mime-multipart +++ b/tools/write-mime-multipart @@ -24,7 +24,8 @@ starts_with_mappings={ '#include' : 'text/x-include-url', '#!' : 'text/x-shellscript', '#cloud-config' : 'text/cloud-config', - '#upstart-job' : 'text/upstart-job' + '#upstart-job' : 'text/upstart-job', + '#part-handler' : 'text/part-handler' } def get_type(fname,deftype): |