bosh-bootstrap 0.11.1 → 0.11.2

data/ChangeLog.md

@@ -18,6 +18,7 @@
 * Added `ssh` action to ssh into the microbosh
 * Added `delete` actions to delete the microbosh (but not the IP address and security groups)
 * Add back `bosh-bootstrap` CLI & remove bosh_cli dependency (v0.11.1)
+* Specify which AWS AZ to use via `provider.az` in settings.yml (v0.11.2)
 
 ## v0.10
 

data/README.md

@@ -158,6 +158,19 @@ bosh login
 
 The `deploy` command can be re-run and it will not prompt again for inputs. It aims to be idempotent. This means that if you see any errors when running `deploy`, such as unavailability of VMs or IP addresses, then when you resolve those issues you can re-run the `deploy` command and it will resume the bootstrap of micro-bosh (and the optional inception VM).
 
+### Restrict AWS availability zones
+
+If you get any errors from AWS about availability zones (AZs) being unavailable to your AWS account, or a specific instance type/flavor is not available to you in your AZ, then you can try specifying an explicit AZ in your `~/.microbosh/settings.yml` file.
+
+Add `provider.az` to specify an AZ within the region you have chosen:
+
+```
+provider:
+  name: "aws"
+  region: us-east-1
+  az: us-east-1c
+```
+
 ## SSH access
 
 You can open an SSH shell to your micro bosh:

data/TODO.md

@@ -1,12 +1,43 @@
 ## Known issues
 
+* specify an AZ to use in the region
 * target & create user after deployment
 * upgrade (if its already running successfully; else delete & redeploy)
 * multiple deployments
   * bosh name (currently fixed at test-bosh)
   * ~/.microbosh folder is singular
 
-* specify an AZ to use in the region
+
+### Specify region
+
+You run the tool, it fails because of region restrictions.
+
+Add the following to your settings.yml
+
+``` yaml
+provider:
+  name: "aws"
+  ignore_az:
+  - us-east-1b
+  - us-west-2c
+```
+
+Or:
+
+``` yaml
+provider:
+  name: "aws"
+  region: us-east-1
+  az: us-east-1c
+```
+
+The AZ choice then maps into `micro_bosh.yml`:
+
+``` yaml
+resources:
+  cloud_properties:
+    availability_zone: AZ
+```
 
 ### Display status
 

data/lib/bosh-bootstrap/key_pair.rb

@@ -1,3 +1,5 @@
+require "fileutils"
+
 class Bosh::Bootstrap::KeyPair
   include FileUtils
 

data/lib/bosh-bootstrap/microbosh_providers/aws.rb

@@ -16,7 +16,7 @@ module Bosh::Bootstrap::MicroboshProviders
     end
 
     def to_hash
-      super.merge({
+      data = super.merge({
        "network"=>{"type"=>"dynamic", "vip"=>public_ip},
        "resources"=>
         {"persistent_disk"=>persistent_disk,
@@ -30,6 +30,10 @@ module Bosh::Bootstrap::MicroboshProviders
           {"blobstore"=>{"address"=>public_ip},
            "nats"=>{"address"=>public_ip}},
          "properties"=>{"aws_registry"=>{"address"=>public_ip}}}})
+      if az = settings.exists?("provider.az")
+        data["resources"]["cloud_properties"]["availability_zone"] = az
+      end
+      data
     end
 
     def persistent_disk

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.11.1"
+    VERSION = "0.11.2"
   end
 end

data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml

@@ -0,0 +1,38 @@
+--- 
+name: test-bosh
+logging: 
+  level: DEBUG
+network: 
+  type: dynamic
+  vip: 1.2.3.4
+resources: 
+  persistent_disk: 16384
+  cloud_properties: 
+    instance_type: m1.medium
+    availability_zone: us-west-2a
+cloud: 
+  plugin: aws
+  properties: 
+    aws: 
+      access_key_id: ACCESS
+      secret_access_key: SECRET
+      region: us-west-2
+      ec2_endpoint: ec2.us-west-2.amazonaws.com
+      default_security_groups: 
+      - ssh
+      - bosh_agent_http
+      - bosh_nats_server
+      - bosh_blobstore
+      - bosh_director
+      - bosh_registry
+      default_key_name: test-bosh
+      ec2_private_key: ~/.microbosh/ssh/test-bosh
+apply_spec: 
+  agent: 
+    blobstore: 
+      address: 1.2.3.4
+    nats: 
+      address: 1.2.3.4
+  properties: 
+    aws_registry: 
+      address: 1.2.3.4

data/spec/unit/microbosh_providers/aws_spec.rb

@@ -28,6 +28,25 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
     yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.aws_ec2.yml"))
   end
 
+  it "supports explicit provider.az" do
+    setting "provider.az", "us-west-2a"
+    setting "provider.name", "aws"
+    setting "provider.region", "us-west-2"
+    setting "provider.credentials.aws_access_key_id", "ACCESS"
+    setting "provider.credentials.aws_secret_access_key", "SECRET"
+    setting "address.ip", "1.2.3.4"
+    setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
+    setting "bosh.name", "test-bosh"
+    setting "bosh.salted_password", "salted_password"
+    setting "bosh.persistent_disk", 16384
+
+    subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings)
+
+    subject.create_microbosh_yml(settings)
+    File.should be_exists(microbosh_yml)
+    yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml"))
+  end
+
   describe "stemcell" do
     before do
       setting "provider.name", "aws"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -183,6 +183,7 @@ files:
 - lib/bosh-bootstrap/version.rb
 - lib/bosh/cli/commands/bootstrap.rb
 - spec/assets/.gitkeep
+- spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml
 - spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml
 - spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.yml
@@ -225,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2381433706831646133
+      hash: 671953131192924937
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -235,6 +236,7 @@ summary: bosh-bootstrap configures and deploys a microbosh deployed on either AW
   or OpenStack.
 test_files:
 - spec/assets/.gitkeep
+- spec/assets/microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml
 - spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml
 - spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.yml