tweak the templates so the defaults are actually what we want.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index 1e252a84b95c9c8e74cb861e1d2878e6a4e3185d..ecc96a102844d323d157d1c62aef5d341bd679db 100644 (file)
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -13,7 +13,7 @@
     "InstanceType" : {\r
       "Description" : "WebServer EC2 instance type",\r
       "Type" : "String",\r
-      "Default" : "m1.small",\r
+      "Default" : "m1.large",\r
       "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ],\r
       "ConstraintDescription" : "must be a valid EC2 instance type."\r
     },\r
@@ -61,7 +61,7 @@
       "ConstraintDescription" : "must contain only alphanumeric characters."\r
     },\r
     "LinuxDistribution": {\r
-      "Default": "F17",\r
+      "Default": "F16",\r
       "Description" : "Distribution of choice",\r
       "Type": "String",\r
       "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]\r
@@ -82,12 +82,12 @@
       "cc1.4xlarge" : { "Arch" : "64" }\r
     },\r
     "DistroArch2AMI": {\r
-      "F16"      : { "32" : "F16", "64" : "F16-x86_64" },\r
-      "F17"      : { "32" : "F17", "64" : "F17-x86_64" },\r
-      "U10"      : { "32" : "U10", "64" : "U10-x86_64" },\r
-      "RHEL-6.1" : { "32" : "rhel61", "64" : "rhel61-x86_64" },\r
-      "RHEL-6.2" : { "32" : "rhel62", "64" : "rhel62-x86_64" },\r
-      "RHEL-6.3" : { "32" : "rhel63", "64" : "rhel63-x86_64" }\r
+      "F16"      : { "32" : "F16-i686", "64" : "F16-x86_64" },\r
+      "F17"      : { "32" : "F17-i686", "64" : "F17-x86_64" },\r
+      "U10"      : { "32" : "U10-i686", "64" : "U10-x86_64" },\r
+      "RHEL-6.1" : { "32" : "rhel61-i686", "64" : "rhel61-x86_64" },\r
+      "RHEL-6.2" : { "32" : "rhel62-i686", "64" : "rhel62-x86_64" },\r
+      "RHEL-6.3" : { "32" : "rhel63-i686", "64" : "rhel63-x86_64" }\r
     }\r
   },\r
 \r