Fix SecurityGroups/SecurityGroupIds issue.

This commit is contained in:
Kevin Lyda
2015-03-26 13:49:43 +00:00
parent e2049b7ce7
commit 32aad891ef

View File

@@ -130,7 +130,16 @@
"ImageId": {"Fn::FindInMap" : ["RegionMap", {"Ref": "AWS::Region" }, "AMI"]}, "ImageId": {"Fn::FindInMap" : ["RegionMap", {"Ref": "AWS::Region" }, "AMI"]},
"InstanceType": {"Ref": "InstanceType"}, "InstanceType": {"Ref": "InstanceType"},
"KeyName": {"Ref": "KeyPair"}, "KeyName": {"Ref": "KeyPair"},
"SecurityGroups": [{"Fn::GetAtt": ["KubernetesSecurityGroup", "GroupId"]}], "SecurityGroups": [{"Fn::If": [
"UseEC2Classic",
{"Ref": "KubernetesSecurityGroup"},
{"Ref": "AWS::NoValue"}]
}],
"SecurityGroupIds": [{"Fn::If": [
"UseEC2Classic",
{"Ref": "AWS::NoValue"},
{"Fn::GetAtt": ["KubernetesSecurityGroup", "GroupId"]}]
}],
"UserData": { "Fn::Base64": {"Fn::Join" : ["", [ "UserData": { "Fn::Base64": {"Fn::Join" : ["", [
"#cloud-config\n\n", "#cloud-config\n\n",
"---\n", "---\n",
@@ -300,7 +309,16 @@
"ImageId": {"Fn::FindInMap" : ["RegionMap", {"Ref": "AWS::Region" }, "AMI" ]}, "ImageId": {"Fn::FindInMap" : ["RegionMap", {"Ref": "AWS::Region" }, "AMI" ]},
"InstanceType": {"Ref": "InstanceType"}, "InstanceType": {"Ref": "InstanceType"},
"KeyName": {"Ref": "KeyPair"}, "KeyName": {"Ref": "KeyPair"},
"SecurityGroups": [{"Fn::GetAtt": ["KubernetesSecurityGroup", "GroupId"]}], "SecurityGroups": [{"Fn::If": [
"UseEC2Classic",
{"Ref": "KubernetesSecurityGroup"},
{"Ref": "AWS::NoValue"}]
}],
"SecurityGroupIds": [{"Fn::If": [
"UseEC2Classic",
{"Ref": "AWS::NoValue"},
{"Fn::GetAtt": ["KubernetesSecurityGroup", "GroupId"]}]
}],
"UserData": { "Fn::Base64": {"Fn::Join" : ["", [ "UserData": { "Fn::Base64": {"Fn::Join" : ["", [
"#cloud-config\n\n", "#cloud-config\n\n",
"coreos:\n", "coreos:\n",