Merge pull request #1841 from ddollar/ec2-hvm

carmstrong · carmstrong · commit 41e8f69c2b1c · 2014-09-18T12:57:06.000-07:00
root DeviceName is conditional on paravirtualization type
diff --git a/contrib/ec2/deis.template.json b/contrib/ec2/deis.template.json
@@ -93,6 +93,10 @@
       "ap-northeast-1" : { "PV" : "ami-17210d16", "HVM" : "ami-19210d18" },
       "sa-east-1"      : { "PV" : "ami-efba10f2", "HVM" : "ami-e9ba10f4" }
     },
+    "RootDevices" : {
+      "HVM" : { "Name": "/dev/xvda" },
+      "PV"  : { "Name": "/dev/sda" }
+    },
     "SubnetConfig" : {
       "VPC"     : { "CIDR" : "10.21.0.0/16" },
       "Subnet1" : { "CIDR" : "10.21.1.0/24" },
@@ -221,7 +225,7 @@
         "SecurityGroups": [ { "Fn::GetAtt": ["VPCSecurityGroup", "GroupId"] } ],
         "BlockDeviceMappings" : [
           {
-            "DeviceName" : "/dev/sda",
+            "DeviceName" : { "Fn::FindInMap": [ "RootDevices", { "Ref": "EC2VirtualizationType" }, "Name" ] },
             "Ebs" : { "VolumeSize" : "100" }
           }
         ]

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,10 @@`
`93`	`93`	`"ap-northeast-1" : { "PV" : "ami-17210d16", "HVM" : "ami-19210d18" },`
`94`	`94`	`"sa-east-1" : { "PV" : "ami-efba10f2", "HVM" : "ami-e9ba10f4" }`
`95`	`95`	`},`
	`96`	`+ "RootDevices" : {`
	`97`	`+ "HVM" : { "Name": "/dev/xvda" },`
	`98`	`+ "PV" : { "Name": "/dev/sda" }`
	`99`	`+ },`
`96`	`100`	`"SubnetConfig" : {`
`97`	`101`	`"VPC" : { "CIDR" : "10.21.0.0/16" },`
`98`	`102`	`"Subnet1" : { "CIDR" : "10.21.1.0/24" },`
`@@ -221,7 +225,7 @@`
`221`	`225`	`"SecurityGroups": [ { "Fn::GetAtt": ["VPCSecurityGroup", "GroupId"] } ],`
`222`	`226`	`"BlockDeviceMappings" : [`
`223`	`227`	`{`
`224`		`- "DeviceName" : "/dev/sda",`
	`228`	`+ "DeviceName" : { "Fn::FindInMap": [ "RootDevices", { "Ref": "EC2VirtualizationType" }, "Name" ] },`
`225`	`229`	`"Ebs" : { "VolumeSize" : "100" }`
`226`	`230`	`}`
`227`	`231`	`]`