Permalink
Browse files

InstanceType parameter

  • Loading branch information...
steveyen committed Jul 15, 2011
1 parent 4aa2cfb commit a7a7f09c3b14ee669269e1c3c916858cff897662
Showing with 3,911 additions and 290 deletions.
  1. +43 −9 membase.erb
  2. +43 −9 packs/1-pack-membase
  3. +205 −18 packs/10-pack-membase
  4. +1,825 −108 packs/100-pack-membase
  5. +61 −10 packs/2-pack-membase
  6. +385 −28 packs/20-pack-membase
  7. +79 −11 packs/3-pack-membase
  8. +97 −12 packs/4-pack-membase
  9. +115 −13 packs/5-pack-membase
  10. +925 −58 packs/50-pack-membase
  11. +133 −14 packs/6-pack-membase
View
@@ -6,6 +6,11 @@
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instance",
"Type" : "String"
},
+ "InstanceType": {
+ "Default": "m1.small",
+ "Description": "Type of EC2 instances for the Membase servers",
+ "Type": "String"
+ },
"MembasePackageURL" : {
"Description" : "URL to Membase software package",
"Type" : "String",
@@ -29,24 +34,36 @@
"MinValue" : "0"
},
"ExistingClusterHostPort" : {
- "Description" : "Optional 'host:port', if you want to join new node(s) to an existing cluster node",
+ "Description" : "Optional 'host:port', if you want to join new node(s) to an existing cluster node. Leave as 'host:port' to not join to an existing cluster",
"Type" : "String",
"Default" : "host:port"
},
"UserTag" : {
- "Description" : "Optional tag value, to help track your CloudFormation launched instances",
+ "Description" : "Optional tag value, to help track your launched EC2 instances",
"Type" : "String",
"Default" : "none"
}
},
"Mappings" : {
- "RegionMap" : {
- "us-east-1" : {"AMI" : "ami-8c1fece5"},
- "us-west-1" : {"AMI" : "ami-3bc9997e"},
- "eu-west-1" : {"AMI" : "ami-47cefa33"},
- "ap-southeast-1" : {"AMI" : "ami-6af08e38"},
- "ap-northeast-1" : {"AMI" : "ami-300ca731"}
+ "AWSInstanceType2Arch" : {
+ "t1.micro" : { "Arch" : "64" },
+ "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" }
+ },
+ "AWSRegionArch2AMI" : {
+ "us-east-1" : { "32" : "ami-8c1fece5", "64" : "ami-8e1fece7" },
+ "us-west-1" : { "32" : "ami-3bc9997e", "64" : "ami-c7c99982" },
+ "eu-west-1" : { "32" : "ami-47cefa33", "64" : "ami-45cefa31" },
+ "ap-southeast-1" : { "32" : "ami-6af08e38", "64" : "ami-6ef08e3c" },
+ "ap-northeast-1" : { "32" : "ami-300ca731", "64" : "ami-2e0ca72f" }
}
},
@@ -57,7 +74,24 @@
"Properties" : {
"KeyName" : { "Ref" : "KeyName" },
"SecurityGroups" : [ { "Ref" : "InstanceSecurityGroup" } ],
- "ImageId" : { "Fn::FindInMap" : [ "RegionMap", { "Ref" : "AWS::Region" }, "AMI" ]},
+ "ImageId": {
+ "Fn::FindInMap": [
+ "AWSRegionArch2AMI",
+ {
+ "Ref": "AWS::Region"
+ },
+ {
+ "Fn::FindInMap": [
+ "AWSInstanceType2Arch",
+ {
+ "Ref": "InstanceType"
+ },
+ "Arch"
+ ]
+ }
+ ]
+ },
+ "InstanceType" : { "Ref" : "InstanceType" },
"Tags" : [ {
"Key" : "Name",
"Value" : { "Fn::Join" : ["", [ { "Ref" : "AWS::StackName" }, "-<%= i %>" ]]}
View
@@ -6,6 +6,11 @@
"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instance",
"Type" : "String"
},
+ "InstanceType": {
+ "Default": "m1.small",
+ "Description": "Type of EC2 instances for the Membase servers",
+ "Type": "String"
+ },
"MembasePackageURL" : {
"Description" : "URL to Membase software package",
"Type" : "String",
@@ -29,24 +34,36 @@
"MinValue" : "0"
},
"ExistingClusterHostPort" : {
- "Description" : "Optional 'host:port', if you want to join new node(s) to an existing cluster node",
+ "Description" : "Optional 'host:port', if you want to join new node(s) to an existing cluster node. Leave as 'host:port' to not join to an existing cluster",
"Type" : "String",
"Default" : "host:port"
},
"UserTag" : {
- "Description" : "Optional tag value, to help track your CloudFormation launched instances",
+ "Description" : "Optional tag value, to help track your launched EC2 instances",
"Type" : "String",
"Default" : "none"
}
},
"Mappings" : {
- "RegionMap" : {
- "us-east-1" : {"AMI" : "ami-8c1fece5"},
- "us-west-1" : {"AMI" : "ami-3bc9997e"},
- "eu-west-1" : {"AMI" : "ami-47cefa33"},
- "ap-southeast-1" : {"AMI" : "ami-6af08e38"},
- "ap-northeast-1" : {"AMI" : "ami-300ca731"}
+ "AWSInstanceType2Arch" : {
+ "t1.micro" : { "Arch" : "64" },
+ "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" }
+ },
+ "AWSRegionArch2AMI" : {
+ "us-east-1" : { "32" : "ami-8c1fece5", "64" : "ami-8e1fece7" },
+ "us-west-1" : { "32" : "ami-3bc9997e", "64" : "ami-c7c99982" },
+ "eu-west-1" : { "32" : "ami-47cefa33", "64" : "ami-45cefa31" },
+ "ap-southeast-1" : { "32" : "ami-6af08e38", "64" : "ami-6ef08e3c" },
+ "ap-northeast-1" : { "32" : "ami-300ca731", "64" : "ami-2e0ca72f" }
}
},
@@ -57,7 +74,24 @@
"Properties" : {
"KeyName" : { "Ref" : "KeyName" },
"SecurityGroups" : [ { "Ref" : "InstanceSecurityGroup" } ],
- "ImageId" : { "Fn::FindInMap" : [ "RegionMap", { "Ref" : "AWS::Region" }, "AMI" ]},
+ "ImageId": {
+ "Fn::FindInMap": [
+ "AWSRegionArch2AMI",
+ {
+ "Ref": "AWS::Region"
+ },
+ {
+ "Fn::FindInMap": [
+ "AWSInstanceType2Arch",
+ {
+ "Ref": "InstanceType"
+ },
+ "Arch"
+ ]
+ }
+ ]
+ },
+ "InstanceType" : { "Ref" : "InstanceType" },
"Tags" : [ {
"Key" : "Name",
"Value" : { "Fn::Join" : ["", [ { "Ref" : "AWS::StackName" }, "-0" ]]}
Oops, something went wrong.

0 comments on commit a7a7f09

Please sign in to comment.