Fixing issues with VPC.

One part of a fix to get this working on AWS VPCs.
This commit is contained in:
Kevin Lyda 2015-03-26 11:35:46 +00:00
parent 8183a4805e
commit e2049b7ce7

View File

@ -130,7 +130,7 @@
"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": [{"Ref": "KubernetesSecurityGroup"}], "SecurityGroups": [{"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 +300,7 @@
"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": [{"Ref": "KubernetesSecurityGroup"}], "SecurityGroups": [{"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",