diff --git a/cfn/F17/AutoScalingMultiAZSample.template b/cfn/F17/AutoScalingMultiAZSample.template index e788449f..32715915 100644 --- a/cfn/F17/AutoScalingMultiAZSample.template +++ b/cfn/F17/AutoScalingMultiAZSample.template @@ -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" } } }, diff --git a/cfn/F17/EC2WithEBSSample.template b/cfn/F17/EC2WithEBSSample.template index 355bbf1f..bc857b29 100644 --- a/cfn/F17/EC2WithEBSSample.template +++ b/cfn/F17/EC2WithEBSSample.template @@ -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" } } }, diff --git a/cfn/F17/HAProxy_Single_Instance.template b/cfn/F17/HAProxy_Single_Instance.template index 384ee131..3400c17d 100644 --- a/cfn/F17/HAProxy_Single_Instance.template +++ b/cfn/F17/HAProxy_Single_Instance.template @@ -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" } } }, diff --git a/cfn/F17/MySQL_Single_Instance.template b/cfn/F17/MySQL_Single_Instance.template index 0ee80b82..3e8d6d54 100644 --- a/cfn/F17/MySQL_Single_Instance.template +++ b/cfn/F17/MySQL_Single_Instance.template @@ -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" } } }, diff --git a/cfn/F17/PuppetMaster_Single_Instance.template b/cfn/F17/PuppetMaster_Single_Instance.template index e6047fb6..c172823b 100644 --- a/cfn/F17/PuppetMaster_Single_Instance.template +++ b/cfn/F17/PuppetMaster_Single_Instance.template @@ -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" : { diff --git a/cfn/F17/VPN_Service.template b/cfn/F17/VPN_Service.template index 55f6da7d..b5ed364e 100644 --- a/cfn/F17/VPN_Service.template +++ b/cfn/F17/VPN_Service.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_2_Instances.template b/cfn/F17/WordPress_2_Instances.template index 1c164370..7815c806 100644 --- a/cfn/F17/WordPress_2_Instances.template +++ b/cfn/F17/WordPress_2_Instances.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_2_Instances_With_EBS.template b/cfn/F17/WordPress_2_Instances_With_EBS.template index 5ce8cfa1..0e02d480 100644 --- a/cfn/F17/WordPress_2_Instances_With_EBS.template +++ b/cfn/F17/WordPress_2_Instances_With_EBS.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_2_Instances_With_EBS_EIP.template b/cfn/F17/WordPress_2_Instances_With_EBS_EIP.template index 95234c30..18dcb430 100644 --- a/cfn/F17/WordPress_2_Instances_With_EBS_EIP.template +++ b/cfn/F17/WordPress_2_Instances_With_EBS_EIP.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_And_Http.template b/cfn/F17/WordPress_And_Http.template index f2300e65..5932c7a3 100644 --- a/cfn/F17/WordPress_And_Http.template +++ b/cfn/F17/WordPress_And_Http.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Composed_Instances.template b/cfn/F17/WordPress_Composed_Instances.template index bd22247b..817a69d4 100644 --- a/cfn/F17/WordPress_Composed_Instances.template +++ b/cfn/F17/WordPress_Composed_Instances.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_NoKey.template b/cfn/F17/WordPress_NoKey.template index 4fd677c9..37d7e967 100644 --- a/cfn/F17/WordPress_NoKey.template +++ b/cfn/F17/WordPress_NoKey.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance.template b/cfn/F17/WordPress_Single_Instance.template index a207298b..969941d4 100644 --- a/cfn/F17/WordPress_Single_Instance.template +++ b/cfn/F17/WordPress_Single_Instance.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance_With_EBS.template b/cfn/F17/WordPress_Single_Instance_With_EBS.template index b02619de..e7b069ec 100644 --- a/cfn/F17/WordPress_Single_Instance_With_EBS.template +++ b/cfn/F17/WordPress_Single_Instance_With_EBS.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance_With_EBS_EIP.template b/cfn/F17/WordPress_Single_Instance_With_EBS_EIP.template index 9a5b84c0..621526be 100644 --- a/cfn/F17/WordPress_Single_Instance_With_EBS_EIP.template +++ b/cfn/F17/WordPress_Single_Instance_With_EBS_EIP.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance_With_EIP.template b/cfn/F17/WordPress_Single_Instance_With_EIP.template index a84e02f3..86c0a148 100644 --- a/cfn/F17/WordPress_Single_Instance_With_EIP.template +++ b/cfn/F17/WordPress_Single_Instance_With_EIP.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance_With_HA.template b/cfn/F17/WordPress_Single_Instance_With_HA.template index 727c9825..f1ceeb5d 100644 --- a/cfn/F17/WordPress_Single_Instance_With_HA.template +++ b/cfn/F17/WordPress_Single_Instance_With_HA.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template b/cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template index 3da602ba..f92873b3 100644 --- a/cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template +++ b/cfn/F17/WordPress_Single_Instance_With_HA_AccessPolicy.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance_With_IHA.template b/cfn/F17/WordPress_Single_Instance_With_IHA.template index a1f362cf..09593abd 100644 --- a/cfn/F17/WordPress_Single_Instance_With_IHA.template +++ b/cfn/F17/WordPress_Single_Instance_With_IHA.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance_With_Neutron.template b/cfn/F17/WordPress_Single_Instance_With_Neutron.template index 9610b1fa..4f884e0d 100644 --- a/cfn/F17/WordPress_Single_Instance_With_Neutron.template +++ b/cfn/F17/WordPress_Single_Instance_With_Neutron.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_Single_Instance_gold.template b/cfn/F17/WordPress_Single_Instance_gold.template index f2c3b330..e9b28bf7 100644 --- a/cfn/F17/WordPress_Single_Instance_gold.template +++ b/cfn/F17/WordPress_Single_Instance_gold.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_With_LB.template b/cfn/F17/WordPress_With_LB.template index 33b4cbfc..5328aeeb 100644 --- a/cfn/F17/WordPress_With_LB.template +++ b/cfn/F17/WordPress_With_LB.template @@ -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" } } }, diff --git a/cfn/F17/WordPress_With_RDS.template b/cfn/F17/WordPress_With_RDS.template index 9c5af999..e8e353b6 100644 --- a/cfn/F17/WordPress_With_RDS.template +++ b/cfn/F17/WordPress_With_RDS.template @@ -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" } } },