Merge pull request #6138 from bronislav/update-aws-template

A few update AWS template
This commit is contained in:
Eric Tune 2015-04-02 09:01:58 -07:00
commit 294b71d2af

View File

@ -62,26 +62,26 @@
}, },
"KeyPair": { "KeyPair": {
"Description": "The name of an EC2 Key Pair to allow SSH access to the instance.", "Description": "The name of an EC2 Key Pair to allow SSH access to the instance.",
"Type": "String" "Type": "AWS::EC2::KeyPair::KeyName"
}, },
"VpcId": { "VpcId": {
"Description": "The ID of the VPC to launch into.", "Description": "The ID of the VPC to launch into.",
"Type": "String", "Type": "AWS::EC2::VPC::Id",
"Default": "" "Default": ""
}, },
"SubnetId": { "SubnetId": {
"Description": "The ID of the VPC to launch into (that must be within the supplied VPC)", "Description": "The ID of the subnet to launch into (that must be within the supplied VPC)",
"Type": "String", "Type": "AWS::EC2::Subnet::Id",
"Default": "" "Default": ""
}, },
"SubnetAZ": { "SubnetAZ": {
"Description": "The availability zone of the subnet supplied (for example eu-west-1a)", "Description": "The availability zone of the subnet supplied (for example eu-west-1a)",
"Type": "String", "Type": "String",
"Default": "" "Default": ""
} }
}, },
"Conditions": { "Conditions": {
"UseEC2Classic": {"Fn::Equals": [{"Ref": "VpcId"}, ""]} "UseEC2Classic": {"Fn::Equals": [{"Ref": "VpcId"}, ""]}
}, },
"Resources": { "Resources": {
"KubernetesSecurityGroup": { "KubernetesSecurityGroup": {