From 1d378fd4f9240b3c8d3284870237d201e396c59c Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Tue, 7 May 2013 16:33:34 +1200 Subject: [PATCH] Standardize template instance types on nova defaults Based on the following $ nova flavor-list +----+-----------+-----------+------+-----------+------+-------+ | ID | Name | Memory_MB | Disk | Ephemeral | Swap | VCPUs | +----+-----------+-----------+------+-----------+------+-------+ | 1 | m1.tiny | 512 | 0 | 0 | | 1 | 2 | m1.small | 2048 | 20 | 0 | | 1 - m1.small is specified as the Default for InstanceType parameters (previously this was m1.medium or m1.large. It would be better if there was a flavor with 1GB memory, but m1.small is the next most appropriate.) - m1.tiny is the only flavor mapped to Arch=32 in AWSInstanceType2Arch - AllowedValues and AWSInstanceType2Arch mapping is now limited to the following nova defaults: [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ] This will allow heat/tools/nova_create_flavors.sh to be deleted. Part of blueprint default-nova-flavors Change-Id: Ia8bba4bd17a2d665676104fbdeb1e188b55aeeaf --- cfn/AutoScalingMultiAZSample.template | 15 +++++-------- cfn/AutoScalingMultiAZSample.yaml | 12 +++-------- cfn/EC2WithEBSSample.template | 19 +++++++---------- cfn/HAProxy_Single_Instance.template | 17 ++++++--------- cfn/InstanceGroup.template | 2 +- cfn/MySQL_Single_Instance.template | 17 ++++++--------- cfn/OpenShift.template | 4 ++-- cfn/PuppetMaster_Single_Instance.template | 19 +++++++---------- cfn/Rails_Single_Instance.template | 17 +++++---------- cfn/WordPress_2_Instances.template | 19 +++++++---------- cfn/WordPress_2_Instances_With_EBS.template | 19 +++++++---------- ...ordPress_2_Instances_With_EBS_EIP.template | 19 +++++++---------- cfn/WordPress_And_Http.template | 21 +++++++------------ cfn/WordPress_Composed_Instances.template | 19 +++++++---------- cfn/WordPress_NoKey.template | 19 +++++++---------- cfn/WordPress_Single_Instance.template | 19 +++++++---------- cfn/WordPress_Single_Instance.yaml | 16 +++++--------- ...ordPress_Single_Instance_With_EBS.template | 19 +++++++---------- ...ress_Single_Instance_With_EBS_EIP.template | 19 +++++++---------- ...ordPress_Single_Instance_With_EIP.template | 19 +++++++---------- ...WordPress_Single_Instance_With_HA.template | 19 +++++++---------- cfn/WordPress_Single_Instance_With_HA.yaml | 16 +++++--------- ...gle_Instance_With_HA_AccessPolicy.template | 19 +++++++---------- ...ordPress_Single_Instance_With_IHA.template | 19 +++++++---------- ...ress_Single_Instance_With_Quantum.template | 19 +++++++---------- cfn/WordPress_Single_Instance_deb.template | 19 +++++++---------- cfn/WordPress_Single_Instance_gold.template | 19 +++++++---------- cfn/WordPress_Single_Instance_puppet.template | 19 ++++++----------- cfn/WordPress_With_LB.template | 19 +++++++---------- cfn/WordPress_With_RDS.template | 21 +++++++------------ cfn/getting_started.template | 2 +- 31 files changed, 186 insertions(+), 335 deletions(-) diff --git a/cfn/AutoScalingMultiAZSample.template b/cfn/AutoScalingMultiAZSample.template index cd9fb051..e788449f 100644 --- a/cfn/AutoScalingMultiAZSample.template +++ b/cfn/AutoScalingMultiAZSample.template @@ -14,7 +14,7 @@ "Description" : "WebServer EC2 instance type", "Type" : "String", "Default" : "m1.small", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -71,16 +71,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, + "m1.tiny" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/AutoScalingMultiAZSample.yaml b/cfn/AutoScalingMultiAZSample.yaml index 9be35ded..bc4ca4b7 100644 --- a/cfn/AutoScalingMultiAZSample.yaml +++ b/cfn/AutoScalingMultiAZSample.yaml @@ -7,8 +7,7 @@ Parameters: Description: WebServer EC2 instance type Type: String Default: m1.small - AllowedValues: [t1.micro, m1.small, m1.large, m1.xlarge, m2.xlarge, - m2.2xlarge, m2.4xlarge, c1.medium, c1.xlarge, cc1.4xlarge] + AllowedValues: [m1.tiny, m1.small, m1.medium, m1.large, m1.xlarge] ConstraintDescription: must be a valid EC2 instance type. DBName: {Default: wordpress, Description: The WordPress database name, Type: String, MinLength: '1', @@ -35,16 +34,11 @@ Parameters: AllowedValues: [F18, F17, U10, RHEL-6.1, RHEL-6.2, RHEL-6.3] Mappings: AWSInstanceType2Arch: - t1.micro: {Arch: '32'} + m1.tiny: {Arch: '32'} m1.small: {Arch: '64'} + m1.medium: {Arch: '64'} m1.large: {Arch: '64'} m1.xlarge: {Arch: '64'} - m2.xlarge: {Arch: '64'} - m2.2xlarge: {Arch: '64'} - m2.4xlarge: {Arch: '64'} - c1.medium: {Arch: '32'} - c1.xlarge: {Arch: '64'} - cc1.4xlarge: {Arch: '64'} DistroArch2AMI: F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools} F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools} diff --git a/cfn/EC2WithEBSSample.template b/cfn/EC2WithEBSSample.template index 120bc5f4..d15099ed 100644 --- a/cfn/EC2WithEBSSample.template +++ b/cfn/EC2WithEBSSample.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -37,16 +37,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/HAProxy_Single_Instance.template b/cfn/HAProxy_Single_Instance.template index b9564ee9..384ee131 100644 --- a/cfn/HAProxy_Single_Instance.template +++ b/cfn/HAProxy_Single_Instance.template @@ -19,7 +19,7 @@ "Description": "HAProxy server EC2 instance type", "Default": "m1.small", "Type": "String", - "AllowedValues": [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "AllowedValues": [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription": "must be a valid EC2 instance type." }, @@ -33,16 +33,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/InstanceGroup.template b/cfn/InstanceGroup.template index 9148b8cb..2f73e149 100644 --- a/cfn/InstanceGroup.template +++ b/cfn/InstanceGroup.template @@ -12,7 +12,7 @@ "Description" : "Instance type", "Type" : "String", "Default" : "m1.small", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, "ImageId" : { diff --git a/cfn/MySQL_Single_Instance.template b/cfn/MySQL_Single_Instance.template index 24e9b9ed..0ee80b82 100644 --- a/cfn/MySQL_Single_Instance.template +++ b/cfn/MySQL_Single_Instance.template @@ -13,7 +13,7 @@ "InstanceType" : { "Description" : "Database server EC2 instance type", "Type" : "String", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -65,16 +65,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/OpenShift.template b/cfn/OpenShift.template index 45e4ab91..a5c1d8e5 100644 --- a/cfn/OpenShift.template +++ b/cfn/OpenShift.template @@ -105,7 +105,7 @@ "ImageId": { "Fn::FindInMap": [ "JeosImages", "Broker", "Image" ] }, - "InstanceType": "m1.medium", + "InstanceType": "m1.small", "KeyName": { "Ref": "KeyName" }, @@ -207,7 +207,7 @@ "ImageId": { "Fn::FindInMap": [ "JeosImages", "Node", "Image" ] }, - "InstanceType": "m1.medium", + "InstanceType": "m1.small", "KeyName": { "Ref": "KeyName" }, "SecurityGroups": [ { "Ref": "OpenShiftOriginSecurityGroup" } ], "Tags": [ { "Key": "Name", "Value": { "Fn::Join": [ "-", [ "openshift", { "Ref": "Prefix" }, "node" ] ] } } ], diff --git a/cfn/PuppetMaster_Single_Instance.template b/cfn/PuppetMaster_Single_Instance.template index 32d9d35d..e6047fb6 100644 --- a/cfn/PuppetMaster_Single_Instance.template +++ b/cfn/PuppetMaster_Single_Instance.template @@ -7,8 +7,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m2.xlarge","m2.2xlarge","m2.4xlarge","c1.medium","c1.xlarge","cc1.4xlarge","cc2.8xlarge","cg1.4xlarge"], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge"], "ConstraintDescription" : "must be a valid EC2 instance type." }, "KeyName" : { @@ -34,16 +34,11 @@ }, "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/Rails_Single_Instance.template b/cfn/Rails_Single_Instance.template index 54ebebc2..f9a8f4a5 100644 --- a/cfn/Rails_Single_Instance.template +++ b/cfn/Rails_Single_Instance.template @@ -58,26 +58,19 @@ "Description" : "WebServer EC2 instance type", "Type" : "String", "Default" : "m1.small", - "AllowedValues" : [ "t1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m2.xlarge","m2.2xlarge","m2.4xlarge","c1.medium","c1.xlarge","cc1.4xlarge","cc2.8xlarge","cg1.4xlarge"], + "AllowedValues" : [ "m1.tiny","m1.small","m1.medium","m1.medium","m1.large","m1.xlarge"], "ConstraintDescription" : "must be a valid EC2 instance type." } }, "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "64" }, + "m1.tiny" : { "Arch" : "64" }, "m1.small" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "64" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64HVM" }, - "cc2.8xlarge" : { "Arch" : "64HVM" }, - "cg1.4xlarge" : { "Arch" : "64HVM" } + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "AWSRegionArch2AMI" : { diff --git a/cfn/WordPress_2_Instances.template b/cfn/WordPress_2_Instances.template index 195401a2..5be32d08 100644 --- a/cfn/WordPress_2_Instances.template +++ b/cfn/WordPress_2_Instances.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -70,16 +70,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_2_Instances_With_EBS.template b/cfn/WordPress_2_Instances_With_EBS.template index 5d3c93d0..56a4917e 100644 --- a/cfn/WordPress_2_Instances_With_EBS.template +++ b/cfn/WordPress_2_Instances_With_EBS.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -79,16 +79,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_2_Instances_With_EBS_EIP.template b/cfn/WordPress_2_Instances_With_EBS_EIP.template index bf3533d9..7b547a32 100644 --- a/cfn/WordPress_2_Instances_With_EBS_EIP.template +++ b/cfn/WordPress_2_Instances_With_EBS_EIP.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -79,16 +79,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_And_Http.template b/cfn/WordPress_And_Http.template index 9a1adca8..f2300e65 100644 --- a/cfn/WordPress_And_Http.template +++ b/cfn/WordPress_And_Http.template @@ -13,10 +13,8 @@ "InstanceType": { "Description": "WebServer EC2 instance type", "Type": "String", - "Default": "m1.large", - "AllowedValues": ["t1.micro", "m1.small", "m1.large", "m1.xlarge", - "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", - "c1.xlarge", "cc1.4xlarge" ], + "Default": "m1.small", + "AllowedValues": ["m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription": "must be a valid EC2 instance type." }, @@ -67,16 +65,11 @@ "Mappings": { "AWSInstanceType2Arch": { - "t1.micro" : { "Arch": "32" }, - "m1.small" : { "Arch": "32" }, - "m1.large" : { "Arch": "64" }, - "m1.xlarge" : { "Arch": "64" }, - "m2.xlarge" : { "Arch": "64" }, - "m2.2xlarge" : { "Arch": "64" }, - "m2.4xlarge" : { "Arch": "64" }, - "c1.medium" : { "Arch": "32" }, - "c1.xlarge" : { "Arch": "64" }, - "cc1.4xlarge": { "Arch": "64" } + "m1.tiny" : { "Arch": "32" }, + "m1.small" : { "Arch": "64" }, + "m1.medium" : { "Arch": "64" }, + "m1.large" : { "Arch": "64" }, + "m1.xlarge" : { "Arch": "64" } }, "DistroArch2AMI": { "F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Composed_Instances.template b/cfn/WordPress_Composed_Instances.template index b8519317..e5b003a3 100644 --- a/cfn/WordPress_Composed_Instances.template +++ b/cfn/WordPress_Composed_Instances.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -70,16 +70,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_NoKey.template b/cfn/WordPress_NoKey.template index f836c14b..cd3535fc 100644 --- a/cfn/WordPress_NoKey.template +++ b/cfn/WordPress_NoKey.template @@ -8,8 +8,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -65,16 +65,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" }, diff --git a/cfn/WordPress_Single_Instance.template b/cfn/WordPress_Single_Instance.template index 3d794302..a207298b 100644 --- a/cfn/WordPress_Single_Instance.template +++ b/cfn/WordPress_Single_Instance.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -70,16 +70,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Single_Instance.yaml b/cfn/WordPress_Single_Instance.yaml index eed4fcf0..8a52ee02 100644 --- a/cfn/WordPress_Single_Instance.yaml +++ b/cfn/WordPress_Single_Instance.yaml @@ -9,9 +9,8 @@ Parameters: InstanceType: Description: WebServer EC2 instance type Type: String - Default: m1.large - AllowedValues: [t1.micro, m1.small, m1.large, m1.xlarge, m2.xlarge, - m2.2xlarge, m2.4xlarge, c1.medium, c1.xlarge, cc1.4xlarge] + Default: m1.small + AllowedValues: [m1.tiny, m1.small, m1.medium, m1.large, m1.xlarge] ConstraintDescription: must be a valid EC2 instance type. DBName: {Default: wordpress, Description: The WordPress database name, Type: String, MinLength: '1', @@ -38,16 +37,11 @@ Parameters: AllowedValues: [F18, F17, U10, RHEL-6.1, RHEL-6.2, RHEL-6.3] Mappings: AWSInstanceType2Arch: - t1.micro: {Arch: '32'} - m1.small: {Arch: '32'} + m1.tiny: {Arch: '32'} + m1.small: {Arch: '64'} + m1.medium: {Arch: '64'} m1.large: {Arch: '64'} m1.xlarge: {Arch: '64'} - m2.xlarge: {Arch: '64'} - m2.2xlarge: {Arch: '64'} - m2.4xlarge: {Arch: '64'} - c1.medium: {Arch: '32'} - c1.xlarge: {Arch: '64'} - cc1.4xlarge: {Arch: '64'} DistroArch2AMI: F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools} F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools} diff --git a/cfn/WordPress_Single_Instance_With_EBS.template b/cfn/WordPress_Single_Instance_With_EBS.template index dbb51132..b02619de 100644 --- a/cfn/WordPress_Single_Instance_With_EBS.template +++ b/cfn/WordPress_Single_Instance_With_EBS.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -79,16 +79,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Single_Instance_With_EBS_EIP.template b/cfn/WordPress_Single_Instance_With_EBS_EIP.template index 1cd3c468..9a5b84c0 100644 --- a/cfn/WordPress_Single_Instance_With_EBS_EIP.template +++ b/cfn/WordPress_Single_Instance_With_EBS_EIP.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WikiServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -79,16 +79,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Single_Instance_With_EIP.template b/cfn/WordPress_Single_Instance_With_EIP.template index bfe1d68b..a84e02f3 100644 --- a/cfn/WordPress_Single_Instance_With_EIP.template +++ b/cfn/WordPress_Single_Instance_With_EIP.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -70,16 +70,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Single_Instance_With_HA.template b/cfn/WordPress_Single_Instance_With_HA.template index b3a96bfb..727c9825 100644 --- a/cfn/WordPress_Single_Instance_With_HA.template +++ b/cfn/WordPress_Single_Instance_With_HA.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -75,16 +75,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Single_Instance_With_HA.yaml b/cfn/WordPress_Single_Instance_With_HA.yaml index 0dca5e58..37ff3bc7 100644 --- a/cfn/WordPress_Single_Instance_With_HA.yaml +++ b/cfn/WordPress_Single_Instance_With_HA.yaml @@ -9,9 +9,8 @@ Parameters: InstanceType: Description: WebServer EC2 instance type Type: String - Default: m1.large - AllowedValues: [t1.micro, m1.small, m1.large, m1.xlarge, m2.xlarge, - m2.2xlarge, m2.4xlarge, c1.medium, c1.xlarge, cc1.4xlarge] + Default: m1.small + AllowedValues: [m1.tiny, m1.small, m1.medium, m1.large, m1.xlarge] ConstraintDescription: must be a valid EC2 instance type. DBName: {Default: wordpress, Description: The WordPress database name, Type: String, MinLength: '1', @@ -40,16 +39,11 @@ Parameters: for cfn-hup, Type: String} Mappings: AWSInstanceType2Arch: - t1.micro: {Arch: '32'} - m1.small: {Arch: '32'} + m1.tiny: {Arch: '32'} + m1.small: {Arch: '64'} + m1.medium: {Arch: '64'} m1.large: {Arch: '64'} m1.xlarge: {Arch: '64'} - m2.xlarge: {Arch: '64'} - m2.2xlarge: {Arch: '64'} - m2.4xlarge: {Arch: '64'} - c1.medium: {Arch: '32'} - c1.xlarge: {Arch: '64'} - cc1.4xlarge: {Arch: '64'} DistroArch2AMI: F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools} F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools} diff --git a/cfn/WordPress_Single_Instance_With_HA_AccessPolicy.template b/cfn/WordPress_Single_Instance_With_HA_AccessPolicy.template index 36d0603a..3da602ba 100644 --- a/cfn/WordPress_Single_Instance_With_HA_AccessPolicy.template +++ b/cfn/WordPress_Single_Instance_With_HA_AccessPolicy.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -75,16 +75,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Single_Instance_With_IHA.template b/cfn/WordPress_Single_Instance_With_IHA.template index 132bd380..a1f362cf 100644 --- a/cfn/WordPress_Single_Instance_With_IHA.template +++ b/cfn/WordPress_Single_Instance_With_IHA.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -75,16 +75,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Single_Instance_With_Quantum.template b/cfn/WordPress_Single_Instance_With_Quantum.template index 049dfbe8..91b6e43a 100644 --- a/cfn/WordPress_Single_Instance_With_Quantum.template +++ b/cfn/WordPress_Single_Instance_With_Quantum.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -70,16 +70,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_Single_Instance_deb.template b/cfn/WordPress_Single_Instance_deb.template index 90ad61f5..f60c2871 100644 --- a/cfn/WordPress_Single_Instance_deb.template +++ b/cfn/WordPress_Single_Instance_deb.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -70,16 +70,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" } diff --git a/cfn/WordPress_Single_Instance_gold.template b/cfn/WordPress_Single_Instance_gold.template index c5205453..f2c3b330 100644 --- a/cfn/WordPress_Single_Instance_gold.template +++ b/cfn/WordPress_Single_Instance_gold.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -70,16 +70,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" }, diff --git a/cfn/WordPress_Single_Instance_puppet.template b/cfn/WordPress_Single_Instance_puppet.template index 6f9bc8f3..6c5401f9 100644 --- a/cfn/WordPress_Single_Instance_puppet.template +++ b/cfn/WordPress_Single_Instance_puppet.template @@ -20,14 +20,14 @@ "Description" : "WebServer EC2 instance type", "Type" : "String", "Default" : "m1.small", - "AllowedValues" : [ "t1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m2.xlarge","m2.2xlarge","m2.4xlarge","c1.medium","c1.xlarge","cc1.4xlarge","cc2.8xlarge","cg1.4xlarge"], + "AllowedValues" : [ "m1.tiny","m1.small","m1.medium","m1.medium","m1.large","m1.xlarge"], "ConstraintDescription" : "must be a valid EC2 instance type." }, "DatabaseType": { "Default": "db.m1.small", "Description" : "The database instance type", "Type": "String", - "AllowedValues" : [ "db.m1.small", "db.m1.large", "db.m1.xlarge", "db.m2.xlarge", "db.m2.2xlarge", "db.m2.4xlarge" ], + "AllowedValues" : [ "db.m1.small", "db.m1.medium", "db.m1.large", "db.m1.xlarge" ], "ConstraintDescription" : "must contain only alphanumeric characters." }, "DatabaseUser": { @@ -54,19 +54,12 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "64" }, + "m1.tiny" : { "Arch" : "64" }, "m1.small" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "64" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64HVM" }, - "cc2.8xlarge" : { "Arch" : "64HVM" }, - "cg1.4xlarge" : { "Arch" : "64HVM" } + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "AWSRegionArch2AMI" : { diff --git a/cfn/WordPress_With_LB.template b/cfn/WordPress_With_LB.template index df37dd8c..99d835db 100644 --- a/cfn/WordPress_With_LB.template +++ b/cfn/WordPress_With_LB.template @@ -13,8 +13,8 @@ "InstanceType": { "Description": "WebServer EC2 instance type", "Type": "String", - "Default": "m1.large", - "AllowedValues": [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default": "m1.small", + "AllowedValues": [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription": "must be a valid EC2 instance type." }, @@ -70,16 +70,11 @@ "Mappings": { "AWSInstanceType2Arch": { - "t1.micro" : { "Arch": "32" }, - "m1.small" : { "Arch": "32" }, - "m1.large" : { "Arch": "64" }, - "m1.xlarge" : { "Arch": "64" }, - "m2.xlarge" : { "Arch": "64" }, - "m2.2xlarge" : { "Arch": "64" }, - "m2.4xlarge" : { "Arch": "64" }, - "c1.medium" : { "Arch": "32" }, - "c1.xlarge" : { "Arch": "64" }, - "cc1.4xlarge" : { "Arch": "64" } + "m1.tiny" : { "Arch": "32" }, + "m1.small" : { "Arch": "64" }, + "m1.medium" : { "Arch": "64" }, + "m1.large" : { "Arch": "64" }, + "m1.xlarge" : { "Arch": "64" } }, "DistroArch2AMI": { "F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" }, diff --git a/cfn/WordPress_With_RDS.template b/cfn/WordPress_With_RDS.template index d8a917e9..9c5af999 100644 --- a/cfn/WordPress_With_RDS.template +++ b/cfn/WordPress_With_RDS.template @@ -13,8 +13,8 @@ "InstanceType" : { "Description" : "WebServer EC2 instance type", "Type" : "String", - "Default" : "m1.large", - "AllowedValues" : [ "t1.micro", "m1.small", "m1.large", "m1.xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium", "c1.xlarge", "cc1.4xlarge" ], + "Default" : "m1.small", + "AllowedValues" : [ "m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ], "ConstraintDescription" : "must be a valid EC2 instance type." }, @@ -22,7 +22,7 @@ "Default" : "db.m1.small", "Description" : "Database instance class", "Type" : "String", - "AllowedValues" : [ "db.m1.small", "db.m1.large", "db.m1.xlarge", "db.m2.xlarge", "db.m2.2xlarge", "db.m2.4xlarge" ], + "AllowedValues" : [ "db.m1.small", "db.m1.medium", "db.m1.large", "db.m1.xlarge" ], "ConstraintDescription" : "must select a valid database instance type." }, @@ -88,16 +88,11 @@ "Mappings" : { "AWSInstanceType2Arch" : { - "t1.micro" : { "Arch" : "32" }, - "m1.small" : { "Arch" : "32" }, - "m1.large" : { "Arch" : "64" }, - "m1.xlarge" : { "Arch" : "64" }, - "m2.xlarge" : { "Arch" : "64" }, - "m2.2xlarge" : { "Arch" : "64" }, - "m2.4xlarge" : { "Arch" : "64" }, - "c1.medium" : { "Arch" : "32" }, - "c1.xlarge" : { "Arch" : "64" }, - "cc1.4xlarge" : { "Arch" : "64" } + "m1.tiny" : { "Arch" : "32" }, + "m1.small" : { "Arch" : "64" }, + "m1.medium" : { "Arch" : "64" }, + "m1.large" : { "Arch" : "64" }, + "m1.xlarge" : { "Arch" : "64" } }, "DistroArch2AMI": { "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, diff --git a/cfn/getting_started.template b/cfn/getting_started.template index 9cc19eb6..a71aef41 100644 --- a/cfn/getting_started.template +++ b/cfn/getting_started.template @@ -13,7 +13,7 @@ "Properties" : { "KeyName" : { "Ref" : "KeyName" }, "ImageId" : "F17-x86_64-cfntools", - "InstanceType": "m1.large", + "InstanceType": "m1.small", "UserData" : { "Fn::Base64" : "80" } } }