From b2e15ce1f738ee239e0db31ddbbdecc7e8a8c765 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 12 Mar 2013 14:39:11 +0000 Subject: [PATCH] heat templates : Update for F18 Remove F16 as it's EOL, update with F18 as it's the current version. Leave the default as F17 for now in all except the Openshift templates (because Openshift doesn't work on F17, although these templates are currently broken anyway..) fixes bug 1154121 Change-Id: Ia95e6bfb4a15e355dfb0051d57f5b70a408551c6 --- templates/AutoScalingMultiAZSample.template | 4 ++-- templates/EC2WithEBSSample.template | 4 ++-- templates/HAProxy_Single_Instance.template | 4 ++-- templates/InstanceGroup.template | 2 +- templates/MySQL_Single_Instance.template | 4 ++-- templates/OpenShift.template | 6 +++--- templates/OpenShift_Prebuilt_JEOS.template | 6 +++--- templates/PuppetMaster_Single_Instance.template | 4 ++-- templates/Rails_Single_Instance.template | 2 +- templates/WordPress_2_Instances.template | 4 ++-- templates/WordPress_2_Instances_With_EBS.template | 4 ++-- templates/WordPress_2_Instances_With_EBS_EIP.template | 4 ++-- templates/WordPress_And_Http.template | 4 ++-- templates/WordPress_Composed_Instances.template | 4 ++-- templates/WordPress_NoKey.template | 4 ++-- templates/WordPress_Single_Instance.template | 4 ++-- templates/WordPress_Single_Instance.yaml | 4 ++-- templates/WordPress_Single_Instance_With_EBS.template | 4 ++-- templates/WordPress_Single_Instance_With_EBS_EIP.template | 4 ++-- templates/WordPress_Single_Instance_With_EIP.template | 4 ++-- templates/WordPress_Single_Instance_With_HA.template | 4 ++-- .../WordPress_Single_Instance_With_HA_AccessPolicy.template | 4 ++-- templates/WordPress_Single_Instance_With_IHA.template | 4 ++-- templates/WordPress_Single_Instance_With_Quantum.template | 4 ++-- templates/WordPress_Single_Instance_gold.template | 4 ++-- templates/WordPress_With_LB.template | 4 ++-- templates/WordPress_With_RDS.template | 4 ++-- templates/getting_started.template | 2 +- 28 files changed, 55 insertions(+), 55 deletions(-) diff --git a/templates/AutoScalingMultiAZSample.template b/templates/AutoScalingMultiAZSample.template index fd433b57..cd9fb051 100644 --- a/templates/AutoScalingMultiAZSample.template +++ b/templates/AutoScalingMultiAZSample.template @@ -65,7 +65,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -83,7 +83,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/EC2WithEBSSample.template b/templates/EC2WithEBSSample.template index f9909629..120bc5f4 100644 --- a/templates/EC2WithEBSSample.template +++ b/templates/EC2WithEBSSample.template @@ -31,7 +31,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -49,7 +49,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/HAProxy_Single_Instance.template b/templates/HAProxy_Single_Instance.template index ceb845f2..b9564ee9 100644 --- a/templates/HAProxy_Single_Instance.template +++ b/templates/HAProxy_Single_Instance.template @@ -27,7 +27,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -45,7 +45,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/InstanceGroup.template b/templates/InstanceGroup.template index 98510a8f..9148b8cb 100644 --- a/templates/InstanceGroup.template +++ b/templates/InstanceGroup.template @@ -18,7 +18,7 @@ "ImageId" : { "Description" : "Name of the image to use", "Type" : "String", - "Default" : "F16-x86_64-cfntools" + "Default" : "F17-x86_64-cfntools" }, "NumInstances": { "Default": "1", diff --git a/templates/MySQL_Single_Instance.template b/templates/MySQL_Single_Instance.template index 10d3d953..24e9b9ed 100644 --- a/templates/MySQL_Single_Instance.template +++ b/templates/MySQL_Single_Instance.template @@ -58,7 +58,7 @@ "LinuxDistribution": { "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ], + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ], "Default": "F17" } }, @@ -77,7 +77,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/OpenShift.template b/templates/OpenShift.template index 04483221..f7d312ea 100644 --- a/templates/OpenShift.template +++ b/templates/OpenShift.template @@ -22,10 +22,10 @@ "ConstraintDescription" : "must be a valid EC2 instance type." }, "LinuxDistribution": { - "Default": "F16", + "Default": "F18", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -46,7 +46,7 @@ "cg1.4xlarge" : { "Arch" : "64HVM" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/OpenShift_Prebuilt_JEOS.template b/templates/OpenShift_Prebuilt_JEOS.template index 53a82ed8..98fe78ca 100644 --- a/templates/OpenShift_Prebuilt_JEOS.template +++ b/templates/OpenShift_Prebuilt_JEOS.template @@ -22,10 +22,10 @@ "ConstraintDescription" : "must be a valid EC2 instance type." }, "LinuxDistribution": { - "Default": "F16", + "Default": "F18", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -46,7 +46,7 @@ "cg1.4xlarge" : { "Arch" : "64HVM" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools-openshift", "64" : "F16-x86_64-cfntools-openshift" }, + "F18" : { "32" : "F18-i386-cfntools-openshift", "64" : "F18-x86_64-cfntools-openshift" }, "F17" : { "32" : "F17-i386-cfntools-openshift", "64" : "F17-x86_64-cfntools-openshift" }, "U10" : { "32" : "U10-i386-cfntools-openshift", "64" : "U10-x86_64-cfntools-openshift" }, "RHEL-6.1" : { "32" : "rhel61-i386-cfntools-openshift", "64" : "rhel61-x86_64-cfntools-openshift" }, diff --git a/templates/PuppetMaster_Single_Instance.template b/templates/PuppetMaster_Single_Instance.template index 754bbd5c..32d9d35d 100644 --- a/templates/PuppetMaster_Single_Instance.template +++ b/templates/PuppetMaster_Single_Instance.template @@ -29,7 +29,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, "Mappings" : { @@ -46,7 +46,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/Rails_Single_Instance.template b/templates/Rails_Single_Instance.template index 581fa071..54ebebc2 100644 --- a/templates/Rails_Single_Instance.template +++ b/templates/Rails_Single_Instance.template @@ -85,7 +85,7 @@ "us-west-2" : { "32" : "ami-38fe7308", "64" : "ami-30fe7300", "64HVM" : "NOT_YET_SUPPORTED" }, "us-west-1" : { "32" : "ami-11d68a54", "64" : "ami-1bd68a5e", "64HVM" : "NOT_YET_SUPPORTED" }, "eu-west-1" : { "32" : "ami-973b06e3", "64" : "ami-953b06e1", "64HVM" : "NOT_YET_SUPPORTED" }, - "ap-southeast-1" : { "32" : "ami-b4b0cae6", "64" : "F16-x86_64-cfntools", "64HVM" : "NOT_YET_SUPPORTED" }, + "ap-southeast-1" : { "32" : "ami-b4b0cae6", "64" : "F17-x86_64-cfntools", "64HVM" : "NOT_YET_SUPPORTED" }, "ap-northeast-1" : { "32" : "ami-0644f007", "64" : "ami-0a44f00b", "64HVM" : "NOT_YET_SUPPORTED" }, "sa-east-1" : { "32" : "ami-3e3be423", "64" : "ami-3c3be421", "64HVM" : "NOT_YET_SUPPORTED" } } diff --git a/templates/WordPress_2_Instances.template b/templates/WordPress_2_Instances.template index 11283dfd..427ae972 100644 --- a/templates/WordPress_2_Instances.template +++ b/templates/WordPress_2_Instances.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -82,7 +82,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_2_Instances_With_EBS.template b/templates/WordPress_2_Instances_With_EBS.template index 8eafe077..968b0aad 100644 --- a/templates/WordPress_2_Instances_With_EBS.template +++ b/templates/WordPress_2_Instances_With_EBS.template @@ -73,7 +73,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -91,7 +91,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_2_Instances_With_EBS_EIP.template b/templates/WordPress_2_Instances_With_EBS_EIP.template index 7807cf14..c6c31983 100644 --- a/templates/WordPress_2_Instances_With_EBS_EIP.template +++ b/templates/WordPress_2_Instances_With_EBS_EIP.template @@ -73,7 +73,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -91,7 +91,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_And_Http.template b/templates/WordPress_And_Http.template index 81946912..96573e7d 100644 --- a/templates/WordPress_And_Http.template +++ b/templates/WordPress_And_Http.template @@ -61,7 +61,7 @@ "Default": "F17", "Description": "Distribution of choice", "Type": "String", - "AllowedValues": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues": [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -79,7 +79,7 @@ "cc1.4xlarge": { "Arch": "64" } }, "DistroArch2AMI": { - "F16" : { "32": "F16-i386-cfntools", "64": "F16-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" }, diff --git a/templates/WordPress_Composed_Instances.template b/templates/WordPress_Composed_Instances.template index 77ceeba5..77f31d47 100644 --- a/templates/WordPress_Composed_Instances.template +++ b/templates/WordPress_Composed_Instances.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -82,7 +82,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_NoKey.template b/templates/WordPress_NoKey.template index f739eeb6..b9f2f925 100644 --- a/templates/WordPress_NoKey.template +++ b/templates/WordPress_NoKey.template @@ -59,7 +59,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -77,7 +77,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-gold", "64" : "F16-x86_64-gold" }, + "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" }, diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template index 07d398b9..da2b379f 100644 --- a/templates/WordPress_Single_Instance.template +++ b/templates/WordPress_Single_Instance.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -82,7 +82,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_Single_Instance.yaml b/templates/WordPress_Single_Instance.yaml index db813f29..2990c66d 100644 --- a/templates/WordPress_Single_Instance.yaml +++ b/templates/WordPress_Single_Instance.yaml @@ -35,7 +35,7 @@ Parameters: Default: F17 Description: Distribution of choice Type: String - AllowedValues: [F16, F17, U10, RHEL-6.1, RHEL-6.2, RHEL-6.3] + AllowedValues: [F18, F17, U10, RHEL-6.1, RHEL-6.2, RHEL-6.3] Mappings: AWSInstanceType2Arch: t1.micro: {Arch: '32'} @@ -49,7 +49,7 @@ Mappings: c1.xlarge: {Arch: '64'} cc1.4xlarge: {Arch: '64'} DistroArch2AMI: - F16: {'32': F16-i386-cfntools, '64': F16-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} diff --git a/templates/WordPress_Single_Instance_With_EBS.template b/templates/WordPress_Single_Instance_With_EBS.template index 005a2955..a8343988 100644 --- a/templates/WordPress_Single_Instance_With_EBS.template +++ b/templates/WordPress_Single_Instance_With_EBS.template @@ -73,7 +73,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -91,7 +91,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_Single_Instance_With_EBS_EIP.template b/templates/WordPress_Single_Instance_With_EBS_EIP.template index 84dd984a..21fa1d38 100644 --- a/templates/WordPress_Single_Instance_With_EBS_EIP.template +++ b/templates/WordPress_Single_Instance_With_EBS_EIP.template @@ -73,7 +73,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -91,7 +91,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_Single_Instance_With_EIP.template b/templates/WordPress_Single_Instance_With_EIP.template index cb55116d..e2dcbf83 100644 --- a/templates/WordPress_Single_Instance_With_EIP.template +++ b/templates/WordPress_Single_Instance_With_EIP.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -82,7 +82,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_Single_Instance_With_HA.template b/templates/WordPress_Single_Instance_With_HA.template index e4a45c25..f31bcc76 100644 --- a/templates/WordPress_Single_Instance_With_HA.template +++ b/templates/WordPress_Single_Instance_With_HA.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] }, "HupPollInterval": { "Default": "1", @@ -87,7 +87,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template b/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template index fcc74e06..69ddb82b 100644 --- a/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template +++ b/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] }, "HupPollInterval": { "Default": "1", @@ -87,7 +87,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_Single_Instance_With_IHA.template b/templates/WordPress_Single_Instance_With_IHA.template index f99586c1..7f715caa 100644 --- a/templates/WordPress_Single_Instance_With_IHA.template +++ b/templates/WordPress_Single_Instance_With_IHA.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] }, "HupPollInterval": { "Default": "1", @@ -87,7 +87,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_Single_Instance_With_Quantum.template b/templates/WordPress_Single_Instance_With_Quantum.template index 1712cdc9..04a9c37e 100644 --- a/templates/WordPress_Single_Instance_With_Quantum.template +++ b/templates/WordPress_Single_Instance_With_Quantum.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -82,7 +82,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/WordPress_Single_Instance_gold.template b/templates/WordPress_Single_Instance_gold.template index 520b9fd1..f7690b74 100644 --- a/templates/WordPress_Single_Instance_gold.template +++ b/templates/WordPress_Single_Instance_gold.template @@ -64,7 +64,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -82,7 +82,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-gold", "64" : "F16-x86_64-gold" }, + "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" }, diff --git a/templates/WordPress_With_LB.template b/templates/WordPress_With_LB.template index 42d5ef70..7616779c 100644 --- a/templates/WordPress_With_LB.template +++ b/templates/WordPress_With_LB.template @@ -64,7 +64,7 @@ "Default": "F17", "Description": "Distribution of choice", "Type": "String", - "AllowedValues": [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues": [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -82,7 +82,7 @@ "cc1.4xlarge" : { "Arch": "64" } }, "DistroArch2AMI": { - "F16" : { "32": "F16-i386-cfntools", "64": "F16-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" }, diff --git a/templates/WordPress_With_RDS.template b/templates/WordPress_With_RDS.template index f616d854..9884e88d 100644 --- a/templates/WordPress_With_RDS.template +++ b/templates/WordPress_With_RDS.template @@ -82,7 +82,7 @@ "Default": "F17", "Description" : "Distribution of choice", "Type": "String", - "AllowedValues" : [ "F16", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] + "AllowedValues" : [ "F18", "F17", "U10", "RHEL-6.1", "RHEL-6.2", "RHEL-6.3" ] } }, @@ -100,7 +100,7 @@ "cc1.4xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { - "F16" : { "32" : "F16-i386-cfntools", "64" : "F16-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" }, diff --git a/templates/getting_started.template b/templates/getting_started.template index 31acfc47..9cc19eb6 100644 --- a/templates/getting_started.template +++ b/templates/getting_started.template @@ -12,7 +12,7 @@ "Type" : "AWS::EC2::Instance", "Properties" : { "KeyName" : { "Ref" : "KeyName" }, - "ImageId" : "F16-x86_64-cfntools", + "ImageId" : "F17-x86_64-cfntools", "InstanceType": "m1.large", "UserData" : { "Fn::Base64" : "80" } } -- 2.45.2