From 49bfcc02a1492bdcb7a89f4fb174b80648166ef3 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Mon, 27 Apr 2015 17:10:27 -0400 Subject: [PATCH 1/2] upgrade to m3 --- lib/bosh-bootstrap/microbosh_providers/aws.rb | 3 ++- spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml | 5 ++++- spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml | 5 ++++- spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml | 5 ++++- spec/assets/microbosh_yml/micro_bosh.aws_vpc_recursor.yml | 5 ++++- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lib/bosh-bootstrap/microbosh_providers/aws.rb b/lib/bosh-bootstrap/microbosh_providers/aws.rb index 116a648..03c1029 100644 --- 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 index 2d2dbcf..d2e5faf 100644 --- 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 index 4c97eca..23b75a3 100644 --- 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 index fed1c8e..5df11ec 100644 --- 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 index be67852..092dec2 100644 --- 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: From e215616b0daa391bae76536303d19e9e907e50c9 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 28 Apr 2015 08:03:09 -0400 Subject: [PATCH 2/2] lock down fog aws, issues with 1.1.2 --- bosh-bootstrap.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/bosh-bootstrap.gemspec b/bosh-bootstrap.gemspec index 61f09ec..b23bdf5 100644 --- 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'