Merge pull request #309 from cloudfoundry-community/m3

upgrade to m3
cloudfoundry-community-attic · Apr 28, 2015 · d607576 · d607576
2 parents 605597c + e215616
commit d607576
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/bosh-bootstrap.gemspec b/bosh-bootstrap.gemspec
@@ -25,6 +25,7 @@ EOS
   gem.add_dependency "bosh_cli_plugin_micro"
   gem.add_dependency "cyoi", "~> 0.11.3"
   gem.add_dependency "fog", "~> 1.11"
+  gem.add_dependency "fog-aws", "0.1.1"
   gem.add_dependency "readwritesettings", "~> 3.0"
   gem.add_dependency "thor", "~> 0.18"
   gem.add_dependency "httpclient", '=2.4.0'

diff --git a/lib/bosh-bootstrap/microbosh_providers/aws.rb b/lib/bosh-bootstrap/microbosh_providers/aws.rb
@@ -56,7 +56,8 @@ def persistent_disk
     end
 
     def resources_cloud_properties
-      {"instance_type"=>"m1.medium"}
+      {"instance_type"=>"m3.medium",
+       "ephemeral_disk"=>{"size" => 163840, "type" => "gp2"}}
     end
 
     def cloud_properties

diff --git a/spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml b/spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml
@@ -8,7 +8,10 @@ network:
 resources:
   persistent_disk: 32768
   cloud_properties:
-    instance_type: m1.medium
+    instance_type: m3.medium
+    ephemeral_disk:
+      size: 163840
+      type: gp2
     availability_zone: us-west-2a
 cloud:
   plugin: aws

diff --git a/spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml b/spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml
@@ -8,7 +8,10 @@ network:
 resources:
   persistent_disk: 32768
   cloud_properties:
-    instance_type: m1.medium
+    instance_type: m3.medium
+    ephemeral_disk:
+      size: 163840
+      type: gp2
 cloud:
   plugin: aws
   properties:

diff --git a/spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml b/spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml
@@ -12,7 +12,10 @@ network:
 resources:
   persistent_disk: 32768
   cloud_properties:
-    instance_type: m1.medium
+    instance_type: m3.medium
+    ephemeral_disk:
+      size: 163840
+      type: gp2
 cloud:
   plugin: aws
   properties:

diff --git a/spec/assets/microbosh_yml/micro_bosh.aws_vpc_recursor.yml b/spec/assets/microbosh_yml/micro_bosh.aws_vpc_recursor.yml
@@ -12,7 +12,10 @@ network:
 resources:
   persistent_disk: 32768
   cloud_properties:
-    instance_type: m1.medium
+    instance_type: m3.medium
+    ephemeral_disk:
+      size: 163840
+      type: gp2
 cloud:
   plugin: aws
   properties: