From 5418ac87cafc2674b5220acd8c02ec36986e7beb Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Thu, 27 Jun 2013 21:31:52 +0200
Subject: [PATCH] Move bootstrapdir requirement to main json schema

---
 base/manifest-schema.json          | 6 +++++-
 providers/ec2/manifest-schema.json | 5 +----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/base/manifest-schema.json b/base/manifest-schema.json
index e1d6a73..68725ec 100644
--- a/base/manifest-schema.json
+++ b/base/manifest-schema.json
@@ -6,6 +6,9 @@
 		"provider": {
 			"type": "string"
 		},
+		"bootstrapdir": {
+			"type": "string"
+		},
 		"volume": {
 			"type": "object",
 			"properties": {
@@ -29,6 +32,7 @@
 				}
 			},
 			"additionalProperties": false
-		}
+		},
+		"require": ["provider", "bootstrapdir"]
 	}
 }
diff --git a/providers/ec2/manifest-schema.json b/providers/ec2/manifest-schema.json
index 9169060..1d3bdd7 100644
--- a/providers/ec2/manifest-schema.json
+++ b/providers/ec2/manifest-schema.json
@@ -3,9 +3,6 @@
 	"title": "EC2 manifest",
 	"type": "object",
 	"properties": {
-		"bootstrapdir": {
-			"type": "string"
-		},
 		"volume": {
 			"type": "object",
 			"properties": {
@@ -21,5 +18,5 @@
 			"required": ["backing", "filesystem"]
 		}
 	},
-	"required": ["bootstrapdir", "volume"]
+	"required": ["volume"]
 }