bosh-bootstrap 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db1e4c9d26c75736374f95c83f8f4e83e2b6e6d
-  data.tar.gz: 474aa72f98edcaed2359487fc0805b5c7d5a07f3
+  metadata.gz: adb4ce189053f551910a65c3696e327991235275
+  data.tar.gz: e6e6f0ef6d6ee0e5c0f336b92a6c17715a7bf064
 SHA512:
-  metadata.gz: 9f5a0a079b6c45979830d32455c860ba7e6d9b475d260ca8e4357e8adeba174a09a4e3b19d1f4dfeaf46381d3762cba167e72f0c85a032db8b783e901cac62f9
-  data.tar.gz: 76e4cf43cf5649fa63e7f78687825864f31e28626adb72ab440d2774eb4f82625228bb871307bd8dffc2a699129d4ee3f6473336399e9947600d8ac8707614fc
+  metadata.gz: b323094bce6d018e9693ee0c0a0b841fd20824a4674d9bd46a704577afa1c6834a1609b585be389fb2dde1033742fd960dd330ed1f98a862b6034408ba60f9ed
+  data.tar.gz: 00977695a6ed8a4cbdca9de8854152070bb8498bc66e0457d2a1ef9fc761ab74d84be3d03525ff7fbafa59deb3e0e4c52dd6e133d157af16dc22378e832090bb

data/ChangeLog.md

@@ -18,6 +18,8 @@ v0.14
 -	[aws] reuse existing bosh stemcell AMIs - automatically detects if a stemcell has been uploaded/converted into an AMI [v0.14.2]
 -	[openstack] reuse existing bosh stemcell images - automatically detects if a stemcell has been uploaded/converted into an OpenStack image [v0.14.3]
 -	[aws vpc] security groups are uniquely named per VPC [v0.14.4]
+- [aws vpc] added dns recursor to vpc [v0.14.5]
+- added ability to set dns recursor [v0.14.5]
 
 v0.13
 -----

data/lib/bosh-bootstrap.rb

@@ -2,6 +2,13 @@
 require "redcard"
 RedCard.verify :mri, :ruby, :rubinius, "1.9"
 
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    self.merge(second, &merger)
+  end
+end
+
 module Bosh
   module Bootstrap
   end

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

@@ -21,6 +21,11 @@ module Bosh::Bootstrap::MicroboshProviders
       if az = settings.exists?("provider.az")
         data["resources"]["cloud_properties"]["availability_zone"] = az
       end
+      if vpc?
+        dns = settings.exists?("recursor") ? settings.recursor : vpc_dns(public_ip)
+        data["apply_spec"]["properties"]["dns"] = {}
+        data["apply_spec"]["properties"]["dns"]["recursor"] = dns
+      end
       data
     end
 
@@ -102,7 +107,7 @@ module Bosh::Bootstrap::MicroboshProviders
     def vpc?
       settings.address["subnet_id"]
     end
-
+    # Note: this should work for all /16 vpcs and may run into issues with other blocks
     def vpc_dns(ip_address)
       ip_address.gsub(/^(\d+)\.(\d+)\..*/, '\1.\2.0.2')
     end

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

@@ -30,8 +30,8 @@ class Bosh::Bootstrap::MicroboshProviders::Base
 
   def to_hash
     {"name"=>microbosh_name,
-     "logging"=>{"level"=>"DEBUG"}
-    }
+     "logging"=>{"level"=>"DEBUG"},
+    }.merge(default_apply_spec)
   end
 
   def microbosh_name
@@ -96,4 +96,14 @@ class Bosh::Bootstrap::MicroboshProviders::Base
   def stemcell_dir
     File.dirname(manifest_path)
   end
+
+  def default_apply_spec
+    return {} unless  settings.exists?("recursor")
+    {"apply_spec"=>
+      {"properties"=>
+       {"dns"=>{
+         "recursor"=>settings.recursor} }
+      }
+    }
+  end
 end

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

@@ -4,7 +4,7 @@ module Bosh::Bootstrap::MicroboshProviders
   class OpenStack < Base
 
     def to_hash
-      super.merge({
+      super.deep_merge({
        "network"=>network_configuration,
        "resources"=>
         {"persistent_disk"=>persistent_disk,

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.14.4"
+    VERSION = "0.14.5"
   end
 end

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

@@ -36,3 +36,5 @@ apply_spec:
   properties:
     aws_registry:
       address: 1.2.3.4
+    dns:
+      recursor: 1.2.0.2

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

@@ -0,0 +1,40 @@
+---
+name: test-bosh
+logging:
+  level: DEBUG
+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:
+  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-vpc-123456
+      - dns-server-vpc-123456
+      - bosh-vpc-123456
+      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
+    dns:
+      recursor: 4.5.6.7

data/spec/assets/microbosh_yml/micro_bosh.base.with_recursor.yml

@@ -0,0 +1,8 @@
+---
+name: test-bosh
+logging:
+  level: DEBUG
+apply_spec:
+  properties:
+    dns:
+      recursor: 4.5.6.7

data/spec/assets/microbosh_yml/micro_bosh.base.without_recursor.yml

@@ -0,0 +1,4 @@
+---
+name: test-bosh
+logging:
+  level: DEBUG

data/spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml

@@ -0,0 +1,47 @@
+---
+name: test-bosh
+logging:
+  level: DEBUG
+network:
+  type: dynamic
+  vip: 1.2.3.4
+  cloud_properties:
+    net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
+resources:
+  persistent_disk: 16384
+  cloud_properties:
+    instance_type: m1.medium
+cloud:
+  plugin: openstack
+  properties:
+    openstack:
+      auth_url: http://10.0.0.2:5000/v2.0/tokens
+      username: USER
+      api_key: PASSWORD
+      tenant: TENANT
+      region: REGION
+      default_security_groups:
+      - ssh
+      - dns-server
+      - bosh
+      default_key_name: test-bosh
+      private_key: ~/.microbosh/ssh/test-bosh
+      connection_options:
+        ssl_verify_peer: false
+      boot_from_volume: false
+apply_spec:
+  agent:
+    blobstore:
+      address: 1.2.3.4
+    nats:
+      address: 1.2.3.4
+  properties:
+    dns:
+      recursor: 4.5.6.7
+    director:
+      max_threads: 3
+    hm:
+      resurrector_enabled: true
+    ntp:
+      - 0.north-america.pool.ntp.org
+      - 1.north-america.pool.ntp.org

data/spec/unit/microbosh_providers/aws_spec.rb

@@ -186,5 +186,26 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
       expect(subject).to receive(:owned_images).and_return([])
       expect(subject.find_ami_for_stemcell("xxxx", "12345")).to be_nil
     end
+
+    it "adds recursor if present" 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
+      setting "recursor", "4.5.6.7"
+
+      subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings, fog_compute)
+
+      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_recursor.yml"))
+    end
   end
 end

data/spec/unit/microbosh_providers/base_spec.rb

@@ -0,0 +1,34 @@
+
+require "readwritesettings"
+require "bosh-bootstrap/microbosh_providers/base"
+
+describe Bosh::Bootstrap::MicroboshProviders::Base do
+  include Bosh::Bootstrap::Cli::Helpers::Settings
+
+  let(:microbosh_yml) { File.expand_path("~/.microbosh/deployments/micro_bosh.yml")}
+  let(:fog_compute) { instance_double("Fog::Compute::Base") }
+  subject{ Bosh::Bootstrap::MicroboshProviders::Base.new(microbosh_yml, settings, fog_compute ) }
+
+
+  context "creates micro_bosh.yml manifest" do
+    before { setting "bosh.name", "test-bosh" }
+
+    context "when recursor is provided" do
+      it "adds the recursor to the yml" do
+        setting "recursor", "4.5.6.7"
+
+        subject.create_microbosh_yml(settings)
+        File.should be_exists(microbosh_yml)
+        yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.base.with_recursor.yml"))
+      end
+    end
+
+    context "when recursor is not provided" do
+      it "does not adds the recursor to the yml" do
+        subject.create_microbosh_yml(settings)
+        File.should be_exists(microbosh_yml)
+        yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.base.without_recursor.yml"))
+      end
+    end
+  end
+end

data/spec/unit/microbosh_providers/openstack_spec.rb

@@ -29,6 +29,7 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
     end
 
 
+
     it "on neutron with public gateway & floating IP" do
       setting "provider.name", "openstack"
       setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
@@ -94,6 +95,29 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
       expect(File).to be_exists(microbosh_yml)
       yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.boot_from_volume.yml"))
     end
+
+    it "adds recursor if present" do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
+      setting "provider.credentials.openstack_username", "USER"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_region", "REGION"
+      setting "address.subnet_id", "7b8788eb-b49e-4424-9065-75a6b07094ea"
+      setting "address.pool_name", "INTERNET"
+      setting "address.ip", "1.2.3.4" # network.vip
+      setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
+      setting "bosh.name", "test-bosh"
+      setting "bosh.salted_password", "salted_password"
+      setting "bosh.persistent_disk", 16384
+      setting "recursor", "4.5.6.7"
+
+      subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings, fog_compute)
+
+      subject.create_microbosh_yml(settings)
+      File.should be_exists(microbosh_yml)
+      yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.with_recursor.yml"))
+    end
   end
 
   describe "existing stemcells as openstack images" do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyoi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: readwritesettings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
@@ -84,70 +84,70 @@ dependencies:
   name: redcard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Bootstrap a micro bosh universe from one CLI
@@ -158,9 +158,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - ChangeLog.md
 - Gemfile
 - Guardfile
@@ -200,10 +200,14 @@ files:
 - 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.aws_vpc_recursor.yml
+- spec/assets/microbosh_yml/micro_bosh.base.with_recursor.yml
+- spec/assets/microbosh_yml/micro_bosh.base.without_recursor.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.boot_from_volume.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.neutron_manual.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.neutron_vip.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.nova_vip.yml
+- spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml
 - spec/assets/microbosh_yml/micro_bosh.vsphere.yml
 - spec/integration/.gitkeep
 - spec/integration/aws/aws_ec2_basic_spec.rb
@@ -217,6 +221,7 @@ files:
 - spec/unit/commands/ssh_spec.rb
 - spec/unit/key_pair_spec.rb
 - spec/unit/microbosh_providers/aws_spec.rb
+- spec/unit/microbosh_providers/base_spec.rb
 - spec/unit/microbosh_providers/openstack_spec.rb
 - spec/unit/microbosh_providers/vsphere_spec.rb
 - spec/unit/microbosh_spec.rb
@@ -232,12 +237,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -252,10 +257,14 @@ test_files:
 - 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.aws_vpc_recursor.yml
+- spec/assets/microbosh_yml/micro_bosh.base.with_recursor.yml
+- spec/assets/microbosh_yml/micro_bosh.base.without_recursor.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.boot_from_volume.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.neutron_manual.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.neutron_vip.yml
 - spec/assets/microbosh_yml/micro_bosh.openstack.nova_vip.yml
+- spec/assets/microbosh_yml/micro_bosh.openstack.with_recursor.yml
 - spec/assets/microbosh_yml/micro_bosh.vsphere.yml
 - spec/integration/.gitkeep
 - spec/integration/aws/aws_ec2_basic_spec.rb
@@ -269,6 +278,7 @@ test_files:
 - spec/unit/commands/ssh_spec.rb
 - spec/unit/key_pair_spec.rb
 - spec/unit/microbosh_providers/aws_spec.rb
+- spec/unit/microbosh_providers/base_spec.rb
 - spec/unit/microbosh_providers/openstack_spec.rb
 - spec/unit/microbosh_providers/vsphere_spec.rb
 - spec/unit/microbosh_spec.rb