bosh-bootstrap 0.11.5 → 0.11.6

data/ChangeLog.md

@@ -27,6 +27,7 @@
 * rubygem users should be able to install & run from rubygems instead of source workaround (v0.11.5)
 * microbosh volume is smaller 4G and automatically fits on devstack/openstack (v0.11.5; thx @ryfow)
 * security group `bosh_agent_http` renamed to `bosh_agent_https`, with same 6868 port for talking to bosh_agent running in https mode (`bosh_agent_http` can then be deleted) (v0.11.5)
+* add port 53/dns security group (v0.11.6)
 
 ## v0.10
 

data/bin/bosh-bootstrap

@@ -2,10 +2,6 @@
 $:.push File.dirname(__FILE__) + '/../lib'
 
 require "rubygems"
-require "bundler"
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-Bundler.setup(:default)
 
 require "bosh-bootstrap"
 require "bosh-bootstrap/thor_cli"

data/lib/bosh-bootstrap/cli/helpers/bundle.rb

@@ -2,6 +2,8 @@
 require "rake"
 require "rake/file_utils"
 
+require "bundler"
+
 module Bosh::Bootstrap::Cli::Helpers::Bundle
   def bundle(*args)
     Bundler.with_clean_env {

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

@@ -56,6 +56,7 @@ module Bosh::Bootstrap::MicroboshProviders
 
     def security_groups
       ["ssh",
+       "dns_server",
        "bosh_agent_https",
        "bosh_nats_server",
        "bosh_blobstore",
@@ -81,7 +82,7 @@ module Bosh::Bootstrap::MicroboshProviders
     end
 
     def stemcell_uri
-      "http://#{jenkins_bucket}.s3.amazonaws.com/last_successful_micro-bosh-stemcell-aws.tgz"
+      "http://#{jenkins_bucket}.s3.amazonaws.com/micro-bosh-stemcell/aws/latest-micro-bosh-stemcell-aws.tgz"
     end
   end
 end

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

@@ -66,6 +66,7 @@ module Bosh::Bootstrap::MicroboshProviders
 
     def security_groups
       ["ssh",
+       "dns_server",
        "bosh_agent_https",
        "bosh_nats_server",
        "bosh_blobstore",
@@ -74,7 +75,7 @@ module Bosh::Bootstrap::MicroboshProviders
     end
 
     def stemcell_uri
-      "http://#{jenkins_bucket}.s3.amazonaws.com/last_successful_micro-bosh-stemcell-openstack.tgz"
+      "http://#{jenkins_bucket}.s3.amazonaws.com/micro-bosh-stemcell/openstack/latest-micro-bosh-stemcell-openstack.tgz"
     end
   end
 end

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

@@ -16,6 +16,7 @@ module Bosh::Bootstrap::NetworkProviders
     def security_groups
       {
         ssh: 22,
+        dns_server: 53,
         bosh_nats_server: 4222,
         bosh_agent_https: 6868,
         bosh_blobstore: 25250,

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

@@ -16,6 +16,7 @@ module Bosh::Bootstrap::NetworkProviders
     def security_groups
       {
         ssh: 22,
+        dns_server: 53,
         bosh_nats_server: 4222,
         bosh_agent_https: 6868,
         bosh_blobstore: 25250,

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.11.5"
+    VERSION = "0.11.6"
   end
 end

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

@@ -20,6 +20,7 @@ cloud:
       ec2_endpoint: ec2.us-west-2.amazonaws.com
       default_security_groups: 
       - ssh
+      - dns_server
       - bosh_agent_https
       - bosh_nats_server
       - bosh_blobstore

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

@@ -19,6 +19,7 @@ cloud:
       ec2_endpoint: ec2.us-west-2.amazonaws.com
       default_security_groups: 
       - ssh
+      - dns_server
       - bosh_agent_https
       - bosh_nats_server
       - bosh_blobstore

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

@@ -21,6 +21,7 @@ cloud:
       ec2_endpoint: ec2.us-west-2.amazonaws.com
       default_security_groups: 
       - ssh
+      - dns_server
       - bosh_agent_https
       - bosh_nats_server
       - bosh_blobstore

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

@@ -20,6 +20,7 @@ cloud:
       region: REGION
       default_security_groups: 
       - ssh
+      - dns_server
       - bosh_agent_https
       - bosh_nats_server
       - bosh_blobstore

data/spec/unit/microbosh_providers/aws_spec.rb

@@ -8,7 +8,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
   let(:microbosh_yml) { File.expand_path("~/.microbosh/deployments/micro_bosh.yml")}
   let(:aws_jenkins_bucket) { "bosh-jenkins-artifacts" }
   let(:latest_ami_uri) { "http://#{aws_jenkins_bucket}.s3.amazonaws.com/last_successful_micro-bosh-stemcell-aws_ami_us-east-1" }
-  let(:latest_stemcell_uri) { "http://#{aws_jenkins_bucket}.s3.amazonaws.com/last_successful_micro-bosh-stemcell-aws.tgz" }
+  let(:latest_stemcell_uri) { "http://#{aws_jenkins_bucket}.s3.amazonaws.com/micro-bosh-stemcell/aws/latest-micro-bosh-stemcell-aws.tgz" }
 
   it "creates micro_bosh.yml manifest" do
     setting "provider.name", "aws"
@@ -81,7 +81,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
       
       subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings)
       subject.stub(:sh).with("curl -O '#{latest_stemcell_uri}'")
-      subject.stemcell.should =~ %r{deployments/last_successful_micro-bosh-stemcell-aws.tgz$}
+      subject.stemcell.should =~ %r{deployments/latest-micro-bosh-stemcell-aws.tgz$}
     end
   end
 end

data/spec/unit/network_providers/aws_spec.rb

@@ -16,6 +16,7 @@ describe Bosh::Bootstrap::NetworkProviders::AWS do
   it "creates security groups it needs" do
     expected_groups = [
       ["ssh", "ssh", ports: 22],
+      ["dns_server", "dns_server", ports: 53],
       ["bosh_nats_server", "bosh_nats_server", ports: 4222],
       ["bosh_agent_https", "bosh_agent_https", ports: 6868],
       ["bosh_blobstore", "bosh_blobstore", ports: 25250],

data/spec/unit/network_providers/openstack_spec.rb

@@ -15,6 +15,7 @@ describe Bosh::Bootstrap::NetworkProviders::OpenStack do
   it "creates security groups it needs" do
     expected_groups = [
       ["ssh", "ssh", ports: 22],
+      ["dns_server", "dns_server", ports: 53],
       ["bosh_nats_server", "bosh_nats_server", ports: 4222],
       ["bosh_agent_https", "bosh_agent_https", ports: 6868],
       ["bosh_blobstore", "bosh_blobstore", ports: 25250],

data/spec/unit/network_spec.rb

@@ -8,7 +8,7 @@ describe Bosh::Bootstrap::Network do
 
   it "uses NetworkProvider if available" do
     network = Bosh::Bootstrap::Network.new("aws", aws_provider_client)
-    aws_provider_client.should_receive(:create_security_group).exactly(6).times
+    aws_provider_client.should_receive(:create_security_group).exactly(7).times
     network.deploy
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyoi
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1342872360376581564
+      hash: -867321845324653925
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25