Merge "Default to boot instances from volumes (require custom Heat patch)" into release-0.3

2013-10-31 10:21:18 +00:00
parent ba35bb844b 6d0ab71a93
commit c3f1b4f8d0
2 changed files with 2 additions and 0 deletions
--- a/data/templates/cf/Linux.template
+++ b/data/templates/cf/Linux.template
@@ -13,6 +13,7 @@
        "$instanceName": {
            "Type": "AWS::EC2::Instance",
            "Properties": {
+                "BootFromVolume": true,
                "InstanceType": "$instanceType",
                "ImageId": "$imageName",
                "AvailabilityZone": "$availabilityZone",
--- a/data/templates/cf/Windows.template
+++ b/data/templates/cf/Windows.template
@@ -13,6 +13,7 @@
        "$instanceName": {
            "Type": "AWS::EC2::Instance",
            "Properties": {
+                "BootFromVolume": true,
                "InstanceType": "$instanceType",
                "ImageId": "$imageName",
                "AvailabilityZone": "$availabilityZone",