From ae1327811bfe565871ae453456ec42d57a12913d Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Wed, 6 Nov 2013 22:17:55 +0100
Subject: [PATCH] Manifest cleanup, begin with simple manifests only No
 plugins. They should be explained in the documentation

---
 manifests/ec2-ebs-partitioned.manifest.json | 33 +++++++++++++
 manifests/ec2-ebs-pvm.manifest.json         | 53 ---------------------
 manifests/ec2-ebs.manifest.json             | 33 +++++++++++++
 manifests/ec2-s3-pvm.manifest.json          | 43 -----------------
 manifests/ec2-s3.manifest.json              | 37 ++++++++++++++
 manifests/kvm-virtio.manifest.json          | 39 ---------------
 manifests/one-ide.manifest.json             | 31 ------------
 manifests/one-virtio.manifest.json          | 31 ------------
 manifests/virtualbox.manifest.json          |  6 +--
 9 files changed, 106 insertions(+), 200 deletions(-)
 create mode 100644 manifests/ec2-ebs-partitioned.manifest.json
 delete mode 100644 manifests/ec2-ebs-pvm.manifest.json
 create mode 100644 manifests/ec2-ebs.manifest.json
 delete mode 100644 manifests/ec2-s3-pvm.manifest.json
 create mode 100644 manifests/ec2-s3.manifest.json
 delete mode 100644 manifests/kvm-virtio.manifest.json
 delete mode 100644 manifests/one-ide.manifest.json
 delete mode 100644 manifests/one-virtio.manifest.json

diff --git a/manifests/ec2-ebs-partitioned.manifest.json b/manifests/ec2-ebs-partitioned.manifest.json
new file mode 100644
index 0000000..41666dc
--- /dev/null
+++ b/manifests/ec2-ebs-partitioned.manifest.json
@@ -0,0 +1,33 @@
+{
+	"provider":       "ec2",
+	"virtualization": "pvm",
+	"credentials":    {
+		// "access-key": null,
+		// "secret-key": null
+	},
+
+	"bootstrapper": {
+		"workspace": "/target"
+	},
+	"image": {
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
+		"description": "Debian {release} {architecture} AMI ({virtualization})"
+	},
+	"system": {
+		"release":      "wheezy",
+		"architecture": "amd64",
+		"timezone":     "UTC",
+		"locale":       "en_US",
+		"charmap":      "UTF-8"
+	},
+	"volume": {
+		"backing": "ebs",
+		"partitions": {
+			"type": "mbr",
+			"root": {
+				"size":       1023,
+				"filesystem": "ext4"
+			}
+		}
+	}
+}
diff --git a/manifests/ec2-ebs-pvm.manifest.json b/manifests/ec2-ebs-pvm.manifest.json
deleted file mode 100644
index d932077..0000000
--- a/manifests/ec2-ebs-pvm.manifest.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-	"provider":       "ec2",
-	"virtualization": "pvm",
-	"credentials":    {
-		"access-key": null,
-		"secret-key": null
-	},
-
-	"bootstrapper": {
-		"workspace": "/target",
-		"mirror": "http://http.debian.net/debian"
-	},
-	"image": {
-		"name":        "debian-{release}-{architecture}-{virtualization}-{%Y}{%m}{%d}",
-		"description": "Debian {release} {architecture} AMI ({virtualization})"
-	},
-	"system": {
-		"release":      "wheezy",
-		"architecture": "amd64",
-		"timezone":     "UTC",
-		"locale":       "en_US",
-		"charmap":      "UTF-8"
-	},
-	"volume": {
-		"backing":    "ebs",
-		"partition_table": {
-			"type": null,
-			"partitions": [
-				{"size":       8192,
-				 "filesystem": "ext4",
-				 "flags":      ["root"]}
-			]
-		}
-	},
-	"plugins": {
-		"admin_user": {
-			"enabled": true,
-			"username": "admin"
-		},
-		"backports": {
-			"enabled": true,
-			"packages": [ "cloud-init" ]
-		},
-		"build_metadata": {
-			"enabled": false,
-			"path":    "/root/build-metadata-{ami_name}"
-		},
-		"prebootstrapped": {
-			"enabled":  false,
-			"snapshot": ""
-		}
-	}
-}
diff --git a/manifests/ec2-ebs.manifest.json b/manifests/ec2-ebs.manifest.json
new file mode 100644
index 0000000..b8c6456
--- /dev/null
+++ b/manifests/ec2-ebs.manifest.json
@@ -0,0 +1,33 @@
+{
+	"provider":       "ec2",
+	"virtualization": "pvm",
+	"credentials":    {
+		// "access-key": null,
+		// "secret-key": null
+	},
+
+	"bootstrapper": {
+		"workspace": "/target"
+	},
+	"image": {
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
+		"description": "Debian {release} {architecture} AMI ({virtualization})"
+	},
+	"system": {
+		"release":      "wheezy",
+		"architecture": "amd64",
+		"timezone":     "UTC",
+		"locale":       "en_US",
+		"charmap":      "UTF-8"
+	},
+	"volume": {
+		"backing": "ebs",
+		"partitions": {
+			"type": "none",
+			"root": {
+				"size":       1024,
+				"filesystem": "ext4"
+			}
+		}
+	}
+}
diff --git a/manifests/ec2-s3-pvm.manifest.json b/manifests/ec2-s3-pvm.manifest.json
deleted file mode 100644
index 9c8a5a5..0000000
--- a/manifests/ec2-s3-pvm.manifest.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"provider":       "ec2",
-	"virtualization": "pvm",
-	"credentials":    {
-		"access-key":  null,
-		"secret-key":  null,
-		"certificate": null,
-		"private-key": null,
-		"user-id":     null
-	},
-
-	"bootstrapper": {
-		"workspace": "/target",
-		"mirror": "http://http.debian.net/debian"
-	},
-	"image": {
-		"name":        "debian-{release}-{architecture}-{virtualization}-{%Y}{%m}{%d}",
-		"description": "Debian {release} {architecture} AMI ({virtualization})"
-		"bucket":      ""
-	},
-	"system": {
-		"release":      "wheezy",
-		"architecture": "amd64",
-		"timezone":     "UTC",
-		"locale":       "en_US",
-		"charmap":      "UTF-8"
-	},
-	"volume": {
-		"backing":      "s3",
-		"filesystem":   "ext4",
-		"size":         1024
-	},
-	"plugins": {
-		"admin_user": {
-			"enabled": true,
-			"username": "admin"
-		},
-		"prebootstrapped": {
-			"enabled":  false,
-			"image": null
-		}
-	}
-}
diff --git a/manifests/ec2-s3.manifest.json b/manifests/ec2-s3.manifest.json
new file mode 100644
index 0000000..93100d0
--- /dev/null
+++ b/manifests/ec2-s3.manifest.json
@@ -0,0 +1,37 @@
+{
+	"provider":       "ec2",
+	"virtualization": "pvm",
+	"credentials":    {
+		// "access-key":  null,
+		// "secret-key":  null,
+		// "certificate": null,
+		// "private-key": null,
+		// "user-id":     null
+	},
+
+	"bootstrapper": {
+		"workspace": "/target"
+	},
+	"image": {
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
+		"description": "Debian {release} {architecture} AMI",
+		"bucket":      "debian-amis"
+	},
+	"system": {
+		"release":      "wheezy",
+		"architecture": "amd64",
+		"timezone":     "UTC",
+		"locale":       "en_US",
+		"charmap":      "UTF-8"
+	},
+	"volume": {
+		"backing": "s3",
+		"partitions": {
+			"type": "none",
+			"root": {
+				"size":       1024,
+				"filesystem": "ext4"
+			}
+		}
+	}
+}
diff --git a/manifests/kvm-virtio.manifest.json b/manifests/kvm-virtio.manifest.json
deleted file mode 100644
index 7076d92..0000000
--- a/manifests/kvm-virtio.manifest.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-	"provider"      : "kvm",
-	"virtualization": "virtio",
-
-	"bootstrapper": {
-		"workspace": "/mnt/target",
-		"mirror"      : "http://ftp.fr.debian.org/debian/"
-	},
-	"image": {
-		"name"       : "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
-		"description": "Debian {release} {architecture} ({virtualization})"
-	},
-	"system": {
-		"release"     : "wheezy",
-		"architecture": "amd64",
-		"timezone"    : "UTC",
-		"locale"      : "en_US",
-		"charmap"     : "UTF-8"
-	},
-	"volume": {
-		"backing"   : "raw",
-		"filesystem": "ext4",
-		"size"      : 1024
-	},
-	"plugins": {
-		"user_packages": {
-			"enabled": true,
-			"repo": [ "apache2" ],
-			"local": []
-		},
-		"root_password": {
-			"enabled": true,
-			"password": "test"
-                },
-		"opennebula": {
-			"enabled": true
-		}
-	}
-}
diff --git a/manifests/one-ide.manifest.json b/manifests/one-ide.manifest.json
deleted file mode 100644
index 05264f4..0000000
--- a/manifests/one-ide.manifest.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"provider"      : "one",
-	"virtualization": "ide",
-
-	"bootstrapper": {
-		"workspace": "/target"
-	},
-	"image": {
-		"name"       : "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
-		"description": "Debian {release} {architecture} ({virtualization})"
-	},
-	"system": {
-		"release"     : "wheezy",
-		"architecture": "amd64",
-		"timezone"    : "UTC",
-		"locale"      : "en_US",
-		"charmap"     : "UTF-8"
-	},
-	"volume": {
-		"backing"   : "raw",
-		"filesystem": "ext4",
-		"size"      : 1024
-	},
-	"plugins": {
-		"user_packages": {
-			"enabled": true,
-			"repo": [ "apache2" ],
-			"local": []
-		}
-	}
-}
diff --git a/manifests/one-virtio.manifest.json b/manifests/one-virtio.manifest.json
deleted file mode 100644
index 930a16d..0000000
--- a/manifests/one-virtio.manifest.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"provider"      : "one",
-	"virtualization": "virtio",
-
-	"bootstrapper": {
-		"workspace": "/target"
-	},
-	"image": {
-		"name"       : "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
-		"description": "Debian {release} {architecture} ({virtualization})"
-	},
-	"system": {
-		"release"     : "wheezy",
-		"architecture": "amd64",
-		"timezone"    : "UTC",
-		"locale"      : "en_US",
-		"charmap"     : "UTF-8"
-	},
-	"volume": {
-		"backing"   : "raw",
-		"filesystem": "ext4",
-		"size"      : 1024
-	},
-	"plugins": {
-		"user_packages": {
-			"enabled": true,
-			"repo": [ "apache2" ],
-			"local": []
-		}
-	}
-}
diff --git a/manifests/virtualbox.manifest.json b/manifests/virtualbox.manifest.json
index d3ce81f..71913ec 100644
--- a/manifests/virtualbox.manifest.json
+++ b/manifests/virtualbox.manifest.json
@@ -16,7 +16,7 @@
 		"charmap"     : "UTF-8"
 	},
 	"volume": {
-		"backing":         "vdi",
+		"backing": "vdi",
 		"partitions": {
 			"type": "mbr",
 			"boot": {
@@ -26,8 +26,8 @@
 			"root": {
 				"size":       991,
 				"filesystem": "ext4"
-			}
-			// ,"swap": {"size": 128}
+			},
+			"swap": {"size": 128}
 		}
 	}
 }