Merge pull request #895 from deis/fix-ec2-space

Gabriel Monroy · Gabriel Monroy · commit 0976369baa8e · 2014-05-06T12:23:53.000-06:00
fix(ec2): add explicit 100GB root volume
diff --git a/contrib/ec2/deis.template b/contrib/ec2/deis.template
@@ -159,8 +159,13 @@
         "InstanceType": {"Ref": "InstanceType"},
         "KeyName": {"Ref": "KeyPair"},
         "SecurityGroups": [{"Ref": "CoreOSSecurityGroup"}, {"Ref": "DeisSecurityGroup"}],
-        "UserData" : { "Fn::Base64": { "Fn::Join": [ "", [ ] ] }
-        }
+        "UserData" : { "Fn::Base64": { "Fn::Join": [ "", [ ] ] } },
+        "BlockDeviceMappings" : [
+          {
+            "DeviceName" : "/dev/sda",
+            "Ebs" : { "VolumeSize" : "100" }
+          }
+        ]
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -159,8 +159,13 @@`
`159`	`159`	`"InstanceType": {"Ref": "InstanceType"},`
`160`	`160`	`"KeyName": {"Ref": "KeyPair"},`
`161`	`161`	`"SecurityGroups": [{"Ref": "CoreOSSecurityGroup"}, {"Ref": "DeisSecurityGroup"}],`
`162`		`- "UserData" : { "Fn::Base64": { "Fn::Join": [ "", [ ] ] }`
`163`		`- }`
	`162`	`+ "UserData" : { "Fn::Base64": { "Fn::Join": [ "", [ ] ] } },`
	`163`	`+ "BlockDeviceMappings" : [`
	`164`	`+ {`
	`165`	`+ "DeviceName" : "/dev/sda",`
	`166`	`+ "Ebs" : { "VolumeSize" : "100" }`
	`167`	`+ }`
	`168`	`+ ]`
`164`	`169`	`}`
`165`	`170`	`}`
`166`	`171`	`}`