openstack/heat
Code Issues Proposed changes

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

Browse Source 
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
Angus Salkeld 2012-03-22 10:05:26 +11:00
parent 8693984a9b
commit 4cea0f1589
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
templates/WordPress_Single_Instance.template
View File

@ -13,7 +13,7 @@
"InstanceType" : {
"Description" : "WebServer EC2 instance type",
"Type" : "String",
"Default" : "m1.small",
"Default" : "m1.large",
"AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ],
"ConstraintDescription" : "must be a valid EC2 instance type."
},
@ -61,7 +61,7 @@
"ConstraintDescription" : "must contain only alphanumeric characters."
},
"LinuxDistribution": {
"Default": "F17",
"Default": "F16",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
@ -82,12 +82,12 @@
"cc1.4xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F16" : { "32" : "F16", "64" : "F16-x86_64" },
"F17" : { "32" : "F17", "64" : "F17-x86_64" },
"U10" : { "32" : "U10", "64" : "U10-x86_64" },
"RHEL-6.1" : { "32" : "rhel61", "64" : "rhel61-x86_64" },
"RHEL-6.2" : { "32" : "rhel62", "64" : "rhel62-x86_64" },
"RHEL-6.3" : { "32" : "rhel63", "64" : "rhel63-x86_64" }
"F16" : { "32" : "F16-i686", "64" : "F16-x86_64" },
"F17" : { "32" : "F17-i686", "64" : "F17-x86_64" },
"U10" : { "32" : "U10-i686", "64" : "U10-x86_64" },
"RHEL-6.1" : { "32" : "rhel61-i686", "64" : "rhel61-x86_64" },
"RHEL-6.2" : { "32" : "rhel62-i686", "64" : "rhel62-x86_64" },
"RHEL-6.3" : { "32" : "rhel63-i686", "64" : "rhel63-x86_64" }
}
},