Merge pull request #227 from jwendell/install_init_scripts

Ec2: Add the variable "install_init_scripts"

bootstrapvz/providers/ec2/README.rst

@@ -11,7 +11,8 @@ Unless `the cloud-init plugin <../../plugins/cloud_init>`__
 is used, special startup scripts will be installed that automatically fetch the
 configured authorized\_key from the instance metadata and save or run
 any userdata supplied (if the userdata begins with ``#!`` it will be
-run).
+run). Set the variable ``install_init_scripts`` to ``False`` in order
+to disable this behaviour.
 
 Credentials
 -----------

bootstrapvz/providers/ec2/__init__.py

@@ -68,12 +68,14 @@ def resolve_tasks(taskset, manifest):
 	                tasks.network.EnableDHCPCDDNS,
 	                initd.AddExpandRoot,
 	                initd.RemoveHWClock,
-	                tasks.initd.AddEC2InitScripts,
 	                initd.InstallInitScripts,
 
 	                tasks.ami.RegisterAMI,
 	                ])
 
+	if manifest.provider.get('install_init_scripts', True):
+		taskset.add(tasks.initd.AddEC2InitScripts)
+
 	if manifest.volume['partitions']['type'] != 'none':
 		taskset.add(initd.AdjustExpandRootScript)