openstack/heat-templates
Code Issues Proposed changes

Standardize template instance types on nova defaults

Browse Source 
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
This commit is contained in:
Steve Baker 2013-05-07 16:33:34 +12:00
parent 69cf73c384
commit 1d378fd4f9
31 changed files with 186 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cfn/AutoScalingMultiAZSample.template
View File

@ -14,7 +14,7 @@
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.small", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -71,16 +71,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "64" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

12
cfn/AutoScalingMultiAZSample.yaml
View File

@ -7,8 +7,7 @@ Parameters:
Description: WebServer EC2 instance type Description: WebServer EC2 instance type
Type: String Type: String
Default: m1.small Default: m1.small
AllowedValues: [t1.micro, m1.small, m1.large, m1.xlarge, m2.xlarge, AllowedValues: [m1.tiny, m1.small, m1.medium, m1.large, m1.xlarge]
m2.2xlarge, m2.4xlarge, c1.medium, c1.xlarge, cc1.4xlarge]
ConstraintDescription: must be a valid EC2 instance type. ConstraintDescription: must be a valid EC2 instance type.
DBName: {Default: wordpress, Description: The DBName: {Default: wordpress, Description: The
WordPress database name, Type: String, MinLength: '1', 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] AllowedValues: [F18, F17, U10, RHEL-6.1, RHEL-6.2, RHEL-6.3]
Mappings: Mappings:
AWSInstanceType2Arch: AWSInstanceType2Arch:
t1.micro: {Arch: '32'} m1.tiny: {Arch: '32'}
m1.small: {Arch: '64'} m1.small: {Arch: '64'}
m1.medium: {Arch: '64'}
m1.large: {Arch: '64'} m1.large: {Arch: '64'}
m1.xlarge: {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: DistroArch2AMI:
F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools} F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools}
F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools} F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools}

19
cfn/EC2WithEBSSample.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -37,16 +37,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

17
cfn/HAProxy_Single_Instance.template
View File

@ -19,7 +19,7 @@
"Description": "HAProxy server EC2 instance type", "Description": "HAProxy server EC2 instance type",
"Default": "m1.small", "Default": "m1.small",
"Type": "String", "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." "ConstraintDescription": "must be a valid EC2 instance type."
}, },
@ -33,16 +33,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

2
cfn/InstanceGroup.template
View File

@ -12,7 +12,7 @@
"Description" : "Instance type", "Description" : "Instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.small", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
"ImageId" : { "ImageId" : {

17
cfn/MySQL_Single_Instance.template
View File

@ -13,7 +13,7 @@
"InstanceType" : { "InstanceType" : {
"Description" : "Database server EC2 instance type", "Description" : "Database server EC2 instance type",
"Type" : "String", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -65,16 +65,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

4
cfn/OpenShift.template
View File

@ -105,7 +105,7 @@
"ImageId": { "ImageId": {
"Fn::FindInMap": [ "JeosImages", "Broker", "Image" ] "Fn::FindInMap": [ "JeosImages", "Broker", "Image" ]
}, },
"InstanceType": "m1.medium", "InstanceType": "m1.small",
"KeyName": { "KeyName": {
"Ref": "KeyName" "Ref": "KeyName"
}, },
@ -207,7 +207,7 @@
"ImageId": { "ImageId": {
"Fn::FindInMap": [ "JeosImages", "Node", "Image" ] "Fn::FindInMap": [ "JeosImages", "Node", "Image" ]
}, },
"InstanceType": "m1.medium", "InstanceType": "m1.small",
"KeyName": { "Ref": "KeyName" }, "KeyName": { "Ref": "KeyName" },
"SecurityGroups": [ { "Ref": "OpenShiftOriginSecurityGroup" } ], "SecurityGroups": [ { "Ref": "OpenShiftOriginSecurityGroup" } ],
"Tags": [ { "Key": "Name", "Value": { "Fn::Join": [ "-", [ "openshift", { "Ref": "Prefix" }, "node" ] ] } } ], "Tags": [ { "Key": "Name", "Value": { "Fn::Join": [ "-", [ "openshift", { "Ref": "Prefix" }, "node" ] ] } } ],

19
cfn/PuppetMaster_Single_Instance.template
View File

@ -7,8 +7,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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.large", "m1.xlarge"],
"ConstraintDescription" : "must be a valid EC2 instance type." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
"KeyName" : { "KeyName" : {
@ -34,16 +34,11 @@
}, },
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

17
cfn/Rails_Single_Instance.template
View File

@ -58,26 +58,19 @@
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.small", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
} }
}, },
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "64" }, "m1.tiny" : { "Arch" : "64" },
"m1.small" : { "Arch" : "64" }, "m1.small" : { "Arch" : "64" },
"m1.medium" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.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" }
}, },
"AWSRegionArch2AMI" : { "AWSRegionArch2AMI" : {

19
cfn/WordPress_2_Instances.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -70,16 +70,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_2_Instances_With_EBS.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -79,16 +79,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_2_Instances_With_EBS_EIP.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -79,16 +79,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

21
cfn/WordPress_And_Http.template
View File

@ -13,10 +13,8 @@
"InstanceType": { "InstanceType": {
"Description": "WebServer EC2 instance type", "Description": "WebServer EC2 instance type",
"Type": "String", "Type": "String",
"Default": "m1.large", "Default": "m1.small",
"AllowedValues": ["t1.micro", "m1.small", "m1.large", "m1.xlarge", "AllowedValues": ["m1.tiny", "m1.small", "m1.medium", "m1.large", "m1.xlarge" ],
"m2.xlarge", "m2.2xlarge", "m2.4xlarge", "c1.medium",
"c1.xlarge", "cc1.4xlarge" ],
"ConstraintDescription": "must be a valid EC2 instance type." "ConstraintDescription": "must be a valid EC2 instance type."
}, },
@ -67,16 +65,11 @@
"Mappings": { "Mappings": {
"AWSInstanceType2Arch": { "AWSInstanceType2Arch": {
"t1.micro" : { "Arch": "32" }, "m1.tiny" : { "Arch": "32" },
"m1.small" : { "Arch": "32" }, "m1.small" : { "Arch": "64" },
"m1.large" : { "Arch": "64" }, "m1.medium" : { "Arch": "64" },
"m1.xlarge" : { "Arch": "64" }, "m1.large" : { "Arch": "64" },
"m2.xlarge" : { "Arch": "64" }, "m1.xlarge" : { "Arch": "64" }
"m2.2xlarge" : { "Arch": "64" },
"m2.4xlarge" : { "Arch": "64" },
"c1.medium" : { "Arch": "32" },
"c1.xlarge" : { "Arch": "64" },
"cc1.4xlarge": { "Arch": "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" }, "F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" },

19
cfn/WordPress_Composed_Instances.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -70,16 +70,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_NoKey.template
View File

@ -8,8 +8,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -65,16 +65,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" }, "F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" },

19
cfn/WordPress_Single_Instance.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -70,16 +70,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

16
cfn/WordPress_Single_Instance.yaml
View File

@ -9,9 +9,8 @@ Parameters:
InstanceType: InstanceType:
Description: WebServer EC2 instance type Description: WebServer EC2 instance type
Type: String Type: String
Default: m1.large Default: m1.small
AllowedValues: [t1.micro, m1.small, m1.large, m1.xlarge, m2.xlarge, AllowedValues: [m1.tiny, m1.small, m1.medium, m1.large, m1.xlarge]
m2.2xlarge, m2.4xlarge, c1.medium, c1.xlarge, cc1.4xlarge]
ConstraintDescription: must be a valid EC2 instance type. ConstraintDescription: must be a valid EC2 instance type.
DBName: {Default: wordpress, Description: The DBName: {Default: wordpress, Description: The
WordPress database name, Type: String, MinLength: '1', 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] AllowedValues: [F18, F17, U10, RHEL-6.1, RHEL-6.2, RHEL-6.3]
Mappings: Mappings:
AWSInstanceType2Arch: AWSInstanceType2Arch:
t1.micro: {Arch: '32'} m1.tiny: {Arch: '32'}
m1.small: {Arch: '32'} m1.small: {Arch: '64'}
m1.medium: {Arch: '64'}
m1.large: {Arch: '64'} m1.large: {Arch: '64'}
m1.xlarge: {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: DistroArch2AMI:
F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools} F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools}
F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools} F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools}

19
cfn/WordPress_Single_Instance_With_EBS.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -79,16 +79,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_Single_Instance_With_EBS_EIP.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WikiServer EC2 instance type", "Description" : "WikiServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -79,16 +79,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_Single_Instance_With_EIP.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -70,16 +70,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_Single_Instance_With_HA.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -75,16 +75,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

16
cfn/WordPress_Single_Instance_With_HA.yaml
View File

@ -9,9 +9,8 @@ Parameters:
InstanceType: InstanceType:
Description: WebServer EC2 instance type Description: WebServer EC2 instance type
Type: String Type: String
Default: m1.large Default: m1.small
AllowedValues: [t1.micro, m1.small, m1.large, m1.xlarge, m2.xlarge, AllowedValues: [m1.tiny, m1.small, m1.medium, m1.large, m1.xlarge]
m2.2xlarge, m2.4xlarge, c1.medium, c1.xlarge, cc1.4xlarge]
ConstraintDescription: must be a valid EC2 instance type. ConstraintDescription: must be a valid EC2 instance type.
DBName: {Default: wordpress, Description: The DBName: {Default: wordpress, Description: The
WordPress database name, Type: String, MinLength: '1', WordPress database name, Type: String, MinLength: '1',
@ -40,16 +39,11 @@ Parameters:
for cfn-hup, Type: String} for cfn-hup, Type: String}
Mappings: Mappings:
AWSInstanceType2Arch: AWSInstanceType2Arch:
t1.micro: {Arch: '32'} m1.tiny: {Arch: '32'}
m1.small: {Arch: '32'} m1.small: {Arch: '64'}
m1.medium: {Arch: '64'}
m1.large: {Arch: '64'} m1.large: {Arch: '64'}
m1.xlarge: {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: DistroArch2AMI:
F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools} F18: {'32': F18-i386-cfntools, '64': F18-x86_64-cfntools}
F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools} F17: {'32': F17-i386-cfntools, '64': F17-x86_64-cfntools}

19
cfn/WordPress_Single_Instance_With_HA_AccessPolicy.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -75,16 +75,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_Single_Instance_With_IHA.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -75,16 +75,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_Single_Instance_With_Quantum.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -70,16 +70,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

19
cfn/WordPress_Single_Instance_deb.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -70,16 +70,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" } "U10" : { "32" : "U10-i386-cfntools", "64" : "U10-x86_64-cfntools" }

19
cfn/WordPress_Single_Instance_gold.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -70,16 +70,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" }, "F18" : { "32" : "F18-i386-gold", "64" : "F18-x86_64-gold" },

19
cfn/WordPress_Single_Instance_puppet.template
View File

@ -20,14 +20,14 @@
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.small", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
"DatabaseType": { "DatabaseType": {
"Default": "db.m1.small", "Default": "db.m1.small",
"Description" : "The database instance type", "Description" : "The database instance type",
"Type": "String", "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." "ConstraintDescription" : "must contain only alphanumeric characters."
}, },
"DatabaseUser": { "DatabaseUser": {
@ -54,19 +54,12 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "64" }, "m1.tiny" : { "Arch" : "64" },
"m1.small" : { "Arch" : "64" }, "m1.small" : { "Arch" : "64" },
"m1.medium" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.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" }
}, },
"AWSRegionArch2AMI" : { "AWSRegionArch2AMI" : {

19
cfn/WordPress_With_LB.template
View File

@ -13,8 +13,8 @@
"InstanceType": { "InstanceType": {
"Description": "WebServer EC2 instance type", "Description": "WebServer EC2 instance type",
"Type": "String", "Type": "String",
"Default": "m1.large", "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." "ConstraintDescription": "must be a valid EC2 instance type."
}, },
@ -70,16 +70,11 @@
"Mappings": { "Mappings": {
"AWSInstanceType2Arch": { "AWSInstanceType2Arch": {
"t1.micro" : { "Arch": "32" }, "m1.tiny" : { "Arch": "32" },
"m1.small" : { "Arch": "32" }, "m1.small" : { "Arch": "64" },
"m1.large" : { "Arch": "64" }, "m1.medium" : { "Arch": "64" },
"m1.xlarge" : { "Arch": "64" }, "m1.large" : { "Arch": "64" },
"m2.xlarge" : { "Arch": "64" }, "m1.xlarge" : { "Arch": "64" }
"m2.2xlarge" : { "Arch": "64" },
"m2.4xlarge" : { "Arch": "64" },
"c1.medium" : { "Arch": "32" },
"c1.xlarge" : { "Arch": "64" },
"cc1.4xlarge" : { "Arch": "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" }, "F18" : { "32": "F18-i386-cfntools", "64": "F18-x86_64-cfntools" },

21
cfn/WordPress_With_RDS.template
View File

@ -13,8 +13,8 @@
"InstanceType" : { "InstanceType" : {
"Description" : "WebServer EC2 instance type", "Description" : "WebServer EC2 instance type",
"Type" : "String", "Type" : "String",
"Default" : "m1.large", "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." "ConstraintDescription" : "must be a valid EC2 instance type."
}, },
@ -22,7 +22,7 @@
"Default" : "db.m1.small", "Default" : "db.m1.small",
"Description" : "Database instance class", "Description" : "Database instance class",
"Type" : "String", "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." "ConstraintDescription" : "must select a valid database instance type."
}, },
@ -88,16 +88,11 @@
"Mappings" : { "Mappings" : {
"AWSInstanceType2Arch" : { "AWSInstanceType2Arch" : {
"t1.micro" : { "Arch" : "32" }, "m1.tiny" : { "Arch" : "32" },
"m1.small" : { "Arch" : "32" }, "m1.small" : { "Arch" : "64" },
"m1.large" : { "Arch" : "64" }, "m1.medium" : { "Arch" : "64" },
"m1.xlarge" : { "Arch" : "64" }, "m1.large" : { "Arch" : "64" },
"m2.xlarge" : { "Arch" : "64" }, "m1.xlarge" : { "Arch" : "64" }
"m2.2xlarge" : { "Arch" : "64" },
"m2.4xlarge" : { "Arch" : "64" },
"c1.medium" : { "Arch" : "32" },
"c1.xlarge" : { "Arch" : "64" },
"cc1.4xlarge" : { "Arch" : "64" }
}, },
"DistroArch2AMI": { "DistroArch2AMI": {
"F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" }, "F18" : { "32" : "F18-i386-cfntools", "64" : "F18-x86_64-cfntools" },

2
cfn/getting_started.template
View File

@ -13,7 +13,7 @@
"Properties" : { "Properties" : {
"KeyName" : { "Ref" : "KeyName" }, "KeyName" : { "Ref" : "KeyName" },
"ImageId" : "F17-x86_64-cfntools", "ImageId" : "F17-x86_64-cfntools",
"InstanceType": "m1.large", "InstanceType": "m1.small",
"UserData" : { "Fn::Base64" : "80" } "UserData" : { "Fn::Base64" : "80" }
} }
} }