bosh-bootstrap 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5ea6f814d89322a4ce8eecc1e9e56d6a8c77578
-  data.tar.gz: a9808b7ddf7eed80eca2fdb9cdf5f973bd14916e
+  metadata.gz: e3238fa74762c2cb66869506e04fd4b1e27d8cfa
+  data.tar.gz: 79d009099d3035550f43ce73d4a3f7703516f670
 SHA512:
-  metadata.gz: 91325833e973b0ca5dbf52d9d5b7090bd7bc2c982169e0c15eab750b3da66b968898ab303cfbfc9a5c03c294c0303786a2aa66c0f8c7466444a0c21c508af53f
-  data.tar.gz: a3e81665b3fcaf6617520af632c2311a5dbcaec9eb27ed3de125964dcdaa33c5c61bfeb683338d31f3f39fbad3a6b33608136796dc57e0b0123eb4432693f88b
+  metadata.gz: 907a2aeb2f8ee2e4bd400474b90282c5ec3e2e9c3d07e0b848d2e6ad19f18fe99570adaa13639bd29f7c424a4e00d4f3edbc3613f432c4b645189db10b14185a
+  data.tar.gz: 0113d4800c5d799f2223300790278a02a86af09e3971242e9ceee9da6e359f1d2cbf476b5f95acd00d9d537bfa77c7842e38005b4a6715adfe3d883f6c5b0a9a

data/ChangeLog.md

@@ -1,7 +1,7 @@
 Change Log
 ==========
 
-`bosh-bootstrap` is a command line tool that you can run on your laptop and automatically get a microbosh (and an inception VM) deployed on AWS (with OpenStack & vSphere coming soon).
+`bosh-bootstrap` is a command line tool that you can run on your laptop and automatically get a Micro BOSH deployed on AWS, OpenStack, or vSphere.
 
 ```
 gem install bosh-bootstrap
@@ -11,8 +11,10 @@ bosh-bootstrap deploy
 v0.14
 
 - default target directory is current director, rather than `~/.microbosh`
+- fixed to use new stemcells
 - [aws] VPC support - detects if VPCs available and allows selection, then select of subset, then creates security groups into the VPC
 - [aws] Using m3.medium instead of m1.medium
+- [aws vpc] network type: manual for vpc
 
 v0.13
 -----

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

@@ -5,7 +5,7 @@ module Bosh::Bootstrap::MicroboshProviders
 
     def to_hash
       data = super.merge({
-       "network"=>{"type"=>"dynamic", "vip"=>public_ip},
+      "network"=>network_configuration,
        "resources"=>
         {"persistent_disk"=>persistent_disk,
          "cloud_properties"=>resources_cloud_properties},
@@ -24,6 +24,25 @@ module Bosh::Bootstrap::MicroboshProviders
       data
     end
 
+    def network_configuration
+      if vpc?
+        {
+          "type" =>"manual",
+          "ip"   => public_ip,
+          "dns"  => [vpc_dns(public_ip)],
+          "cloud_properties" => {
+            "subnet" => settings.address.subnet_id
+          }
+        }
+
+      else
+        {
+          "type"=>"dynamic",
+          "vip"=>public_ip
+        }
+      end
+    end
+
     def persistent_disk
       settings.bosh.persistent_disk
     end
@@ -74,6 +93,13 @@ module Bosh::Bootstrap::MicroboshProviders
       aws_region == "us-east-1"
     end
 
+    def vpc?
+      settings.address["subnet_id"]
+    end
+
+    def vpc_dns(ip_address)
+      ip_address.gsub(/^(\d+)\.(\d+)\..*/, '\1.\2.0.2')
+    end
   end
 end
 Bosh::Bootstrap::MicroboshProviders.register_provider("aws", Bosh::Bootstrap::MicroboshProviders::AWS)

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.14.0"
+    VERSION = "0.14.1"
   end
 end

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

@@ -1,35 +1,35 @@
---- 
+---
 name: test-bosh
-logging: 
+logging:
   level: DEBUG
-network: 
+network:
   type: dynamic
   vip: 1.2.3.4
-resources: 
+resources:
   persistent_disk: 16384
-  cloud_properties: 
-    instance_type: m1.medium
+  cloud_properties:
+    instance_type: m3.medium
     availability_zone: us-west-2a
-cloud: 
+cloud:
   plugin: aws
-  properties: 
-    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: 
+      default_security_groups:
       - ssh
       - dns_server
       - bosh
       default_key_name: test-bosh
       ec2_private_key: ~/.microbosh/ssh/test-bosh
-apply_spec: 
-  agent: 
-    blobstore: 
+apply_spec:
+  agent:
+    blobstore:
       address: 1.2.3.4
-    nats: 
+    nats:
       address: 1.2.3.4
-  properties: 
-    aws_registry: 
+  properties:
+    aws_registry:
       address: 1.2.3.4

data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml

@@ -1,34 +1,34 @@
---- 
+---
 name: test-bosh
-logging: 
+logging:
   level: DEBUG
-network: 
+network:
   type: dynamic
   vip: 1.2.3.4
-resources: 
+resources:
   persistent_disk: 16384
-  cloud_properties: 
-    instance_type: m1.medium
-cloud: 
+  cloud_properties:
+    instance_type: m3.medium
+cloud:
   plugin: aws
-  properties: 
-    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: 
+      default_security_groups:
       - ssh
       - dns_server
       - bosh
       default_key_name: test-bosh
       ec2_private_key: ~/.microbosh/ssh/test-bosh
-apply_spec: 
-  agent: 
-    blobstore: 
+apply_spec:
+  agent:
+    blobstore:
       address: 1.2.3.4
-    nats: 
+    nats:
       address: 1.2.3.4
-  properties: 
-    aws_registry: 
+  properties:
+    aws_registry:
       address: 1.2.3.4

data/spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml

@@ -1,36 +1,38 @@
---- 
+---
 name: test-bosh
-logging: 
+logging:
   level: DEBUG
-network: 
-  type: dynamic
-  vip: 1.2.3.4
-  cloud_properties: 
-    subnet: $SUBNET_ID$
-resources: 
+network:
+  type: manual
+  ip: 1.2.3.4
+  dns:
+  - 1.2.0.2
+  cloud_properties:
+    subnet: subnet-123456
+resources:
   persistent_disk: 16384
-  cloud_properties: 
-    instance_type: m1.medium
-cloud: 
+  cloud_properties:
+    instance_type: m3.medium
+cloud:
   plugin: aws
-  properties: 
-    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: 
+      default_security_groups:
       - ssh
       - dns_server
       - bosh
       default_key_name: test-bosh
       ec2_private_key: ~/.microbosh/ssh/test-bosh
-apply_spec: 
-  agent: 
-    blobstore: 
+apply_spec:
+  agent:
+    blobstore:
       address: 1.2.3.4
-    nats: 
+    nats:
       address: 1.2.3.4
-  properties: 
-    aws_registry: 
+  properties:
+    aws_registry:
       address: 1.2.3.4

data/spec/unit/cli/bootstrap_spec.rb

@@ -26,24 +26,24 @@ begin
 
     it "runs deploy command" do
       cmd = double(Bosh::Bootstrap::Cli::Commands::Deploy)
-      cmd.should_receive(:perform)
+      expect(cmd).to receive(:perform)
       Bosh::Bootstrap::Cli::Commands::Deploy.stub(:new).and_return(cmd)
       cli.deploy
     end
 
     it "runs delete command" do
       cmd = double(Bosh::Bootstrap::Cli::Commands::Delete)
-      cmd.should_receive(:perform)
+      expect(cmd).to receive(:perform)
       Bosh::Bootstrap::Cli::Commands::Delete.stub(:new).and_return(cmd)
       cli.delete
     end
 
     it "runs ssh command" do
       cmd = double(Bosh::Bootstrap::Cli::Commands::SSH)
-      cmd.should_receive(:perform)
+      expect(cmd).to receive(:perform)
       Bosh::Bootstrap::Cli::Commands::SSH.stub(:new).and_return(cmd)
       cli.ssh
     end
   end
 rescue LoadError
-end
+end

data/spec/unit/commands/delete_spec.rb

@@ -11,8 +11,8 @@ describe Bosh::Bootstrap::Cli::Commands::Delete do
   it "deletes microbosh VM" do
     setting "bosh.name", "test-bosh"
     mkdir_p(File.join(settings_dir, "deployments"))
-    subject.should_receive(:sh).with("bundle exec bosh -n micro deployment test-bosh")
-    subject.should_receive(:sh).with("bundle exec bosh -n micro delete")
+    expect(subject).to receive(:sh).with("bundle exec bosh -n micro deployment test-bosh")
+    expect(subject).to receive(:sh).with("bundle exec bosh -n micro delete")
     subject.perform
   end
 end

data/spec/unit/microbosh_providers/aws_spec.rb

@@ -46,6 +46,26 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
     yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.aws_ec2.us-west-2a.yml"))
   end
 
+  it "creates micro_bosh.yml manifest" do
+    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 "address.vpc_id", "vpc-123456"
+    setting "address.subnet_id", "subnet-123456"
+    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)
+    expect(File).to be_exists(microbosh_yml)
+    yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.aws_vpc.yml"))
+  end
+
   describe "stemcell" do
     before do
       setting "provider.name", "aws"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyoi