From 03a9667c64327cf18fb4f6812963f1be17e9206d Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sat, 3 May 2014 21:50:00 +0200
Subject: [PATCH] Add enable_agent option to puppet plugin

---
 CHANGELOG.md                                    | 1 +
 bootstrapvz/plugins/puppet/__init__.py          | 2 ++
 bootstrapvz/plugins/puppet/manifest-schema.json | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0a6a25..8c444bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 	Anders Ingemann:
 		* Require hostname setting for vagrant plugin
 		* Fixes #14: S3 images can now be bootstrapped outside EC2.
+		* Added enable_agent option to puppet plugin
 2014-05-02:
 	Tomasz Rybak:
 		* Added Google Compute Engine Provider
diff --git a/bootstrapvz/plugins/puppet/__init__.py b/bootstrapvz/plugins/puppet/__init__.py
index 458b1cd..5a4fcbf 100644
--- a/bootstrapvz/plugins/puppet/__init__.py
+++ b/bootstrapvz/plugins/puppet/__init__.py
@@ -15,3 +15,5 @@ def resolve_tasks(taskset, manifest):
 	if 'manifest' in manifest.plugins['puppet']:
 		taskset.add(tasks.CheckManifestPath)
 		taskset.add(tasks.ApplyPuppetManifest)
+	if manifest.plugins['puppet'].get('enable_agent', False):
+		taskset.add(tasks.EnableAgent)
diff --git a/bootstrapvz/plugins/puppet/manifest-schema.json b/bootstrapvz/plugins/puppet/manifest-schema.json
index 4e4ca33..cd3891f 100644
--- a/bootstrapvz/plugins/puppet/manifest-schema.json
+++ b/bootstrapvz/plugins/puppet/manifest-schema.json
@@ -10,7 +10,8 @@
 					"type": "object",
 					"properties": {
 						"manifest": { "$ref": "#/definitions/absolute_path" },
-						"assets": { "$ref": "#/definitions/absolute_path" }
+						"assets": { "$ref": "#/definitions/absolute_path" },
+						"enable_agent": { "type": "boolean" }
 					},
 					"minProperties": 1,
 					"additionalProperties": false