openstack
/
heat-templates
Code Issues Proposed changes

Remove misleading OS choices from legacy F17 examples 

These examples all mention alternative OS versions, which is confusing
to users, especially the ubuntu one, which will definitely not work and
evidently is causing confusion for users.

So remove the references to anything other than F17 (which these did work
on at one point).  Obviously we still have to refresh these at some point
to make sure they still work on a non-EOL version of Fedora, but hopefully
this somewhat reduces confusion in the meantime.

Change-Id: I9d40f44f86e40f7d67fa4c3340b7fc6ad01bf270
This commit is contained in:
Steven Hardy 2014-06-06 07:34:20 +01:00
parent 1718862503
commit 8d360e00b4
23 changed files with 45 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cfn/F17/AutoScalingMultiAZSample.template
View File

@ -65,7 +65,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -78,12 +78,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/EC2WithEBSSample.template
View File

@ -37,7 +37,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -50,12 +50,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/HAProxy_Single_Instance.template
View File

@ -27,7 +27,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -40,12 +40,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/MySQL_Single_Instance.template
View File

@ -58,7 +58,7 @@
"LinuxDistribution": {
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ],
"AllowedValues" : [ "F17" ],
"Default": "F17"
}
},
@ -72,12 +72,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/PuppetMaster_Single_Instance.template
View File

@ -29,7 +29,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
"Mappings" : {
@ -41,12 +41,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},
"Resources" : {

10
cfn/F17/VPN_Service.template
View File

@ -65,7 +65,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F19", "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -79,13 +79,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F19" : { "32" : "F19-i386-cfntools", "64" : "F19-x86_64-cfntools" },
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_2_Instances.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -77,12 +77,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_2_Instances_With_EBS.template
View File

@ -73,7 +73,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -86,12 +86,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_2_Instances_With_EBS_EIP.template
View File

@ -73,7 +73,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -86,12 +86,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_And_Http.template
View File

@ -59,7 +59,7 @@
"Default": "F17",
"Description": "Distribution of choice",
"Type": "String",
"AllowedValues": [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues": [ "F17" ]
}
},
@ -72,12 +72,7 @@
"m1.xlarge" : { "Arch": "64" }
},
"DistroArch2AMI": {
"F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" },
"F17" : { "32": "F17-i386-cfntools", "64": "F17-x86_64-cfntools" },
"U10" : { "32": "U10-i386-cfntools", "64": "U10-x86_64-cfntools" },
"RHEL-6.1": { "32": "rhel61-i386-cfntools", "64": "rhel61-x86_64-cfntools" },
"RHEL-6.2": { "32": "rhel62-i386-cfntools", "64": "rhel62-x86_64-cfntools" },
"RHEL-6.3": { "32": "rhel63-i386-cfntools", "64": "rhel63-x86_64-cfntools" }
"F17" : { "32": "F17-i386-cfntools", "64": "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Composed_Instances.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -77,12 +77,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_NoKey.template
View File

@ -59,7 +59,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -72,12 +72,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Single_Instance.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -77,12 +77,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Single_Instance_With_EBS.template
View File

@ -73,7 +73,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -86,12 +86,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Single_Instance_With_EBS_EIP.template
View File

@ -73,7 +73,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -86,12 +86,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Single_Instance_With_EIP.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -77,12 +77,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Single_Instance_With_HA.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
},
"HupPollInterval": {
"Default": "1",
@ -82,12 +82,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
},
"HupPollInterval": {
"Default": "1",
@ -82,12 +82,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Single_Instance_With_IHA.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
},
"HupPollInterval": {
"Default": "1",
@ -82,12 +82,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_Single_Instance_With_Neutron.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -77,12 +77,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},

7
cfn/F17/WordPress_Single_Instance_gold.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -77,12 +77,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" },
"F17" : { "32" : "F17-i386-gold", "64" : "F17-x86_64-gold" },
"U10" : { "32" : "U10-i386-gold", "64" : "U10-x86_64-gold" },
"RHEL-6.1" : { "32" : "rhel61-i386-gold", "64" : "rhel61-x86_64-gold" },
"RHEL-6.2" : { "32" : "rhel62-i386-gold", "64" : "rhel62-x86_64-gold" },
"RHEL-6.3" : { "32" : "rhel63-i386-gold", "64" : "rhel63-x86_64-gold" }
}
},

9
cfn/F17/WordPress_With_LB.template
View File

@ -64,7 +64,7 @@
"Default": "F17",
"Description": "Distribution of choice",
"Type": "String",
"AllowedValues": [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues": [ "F17" ]
}
},
@ -77,12 +77,7 @@
"m1.xlarge" : { "Arch": "64" }
},
"DistroArch2AMI": {
"F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" },
"F17" : { "32": "F17-i386-cfntools", "64": "F17-x86_64-cfntools" },
"U10" : { "32": "U10-i386-cfntools", "64": "U10-x86_64-cfntools" },
"RHEL-6.1": { "32": "rhel61-i386-cfntools", "64": "rhel61-x86_64-cfntools" },
"RHEL-6.2": { "32": "rhel62-i386-cfntools", "64": "rhel62-x86_64-cfntools" },
"RHEL-6.3": { "32": "rhel63-i386-cfntools", "64": "rhel63-x86_64-cfntools" }
"F17" : { "32": "F17-i386-cfntools", "64": "F17-x86_64-cfntools" }
}
},

9
cfn/F17/WordPress_With_RDS.template
View File

@ -82,7 +82,7 @@
"Default": "F17",
"Description" : "Distribution of choice",
"Type": "String",
"AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ]
"AllowedValues" : [ "F17" ]
}
},
@ -95,12 +95,7 @@
"m1.xlarge" : { "Arch" : "64" }
},
"DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" },
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" },
"RHEL-6.1" : { "32" : "rhel61-i386-cfntools", "64" : "rhel61-x86_64-cfntools" },
"RHEL-6.2" : { "32" : "rhel62-i386-cfntools", "64" : "rhel62-x86_64-cfntools" },
"RHEL-6.3" : { "32" : "rhel63-i386-cfntools", "64" : "rhel63-x86_64-cfntools" }
"F17" : { "32" : "F17-i386-cfntools", "64" : "F17-x86_64-cfntools" }
}
},