bosh-bootstrap 0.11.4 → 0.11.5

data/ChangeLog.md

@@ -5,6 +5,9 @@
     gem install bosh-bootstrap
     bosh-bootstrap deploy
 
+## Next
+
+
 ## v0.11
 
 * Complete rewrite of bosh-bootstrap in orphan branch
@@ -21,6 +24,9 @@
 * Specify which AWS AZ to use via `provider.az` in settings.yml (v0.11.2)
 * Support for OpenStack (also in cyoi 0.4.3) thanks to Ferdy! (v0.11.3)
 * Ensure CLI loads bundler (v0.11.4)
+* 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)
 
 ## v0.10
 

data/README.md

@@ -109,7 +109,7 @@ Created security group ssh
  -> opened ports ports TCP 22..22 from IP range 0.0.0.0/0
 Created security group bosh_nats_server
  -> opened ports ports TCP 4222..4222 from IP range 0.0.0.0/0
-Created security group bosh_agent_http
+Created security group bosh_agent_https
  -> opened ports ports TCP 6868..6868 from IP range 0.0.0.0/0
 Created security group bosh_blobstore
  -> opened ports ports TCP 25250..25250 from IP range 0.0.0.0/0

data/bin/bosh-bootstrap

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

data/lib/bosh-bootstrap/cli/commands/deploy.rb

@@ -2,7 +2,6 @@ module Bosh; module Bootstrap; module Cli; module Commands; end; end; end; end
 
 require "cyoi/cli/provider"
 require "cyoi/cli/address"
-require "cyoi/cli/key_pair"
 require "bosh-bootstrap/cli/helpers"
 require "bosh-bootstrap/microbosh"
 
@@ -47,17 +46,6 @@ class Bosh::Bootstrap::Cli::Commands::Deploy
     network.deploy
   end
 
-  def setup_keypair
-    key_pair_name = settings.exists?("key_pair.name") || settings.bosh.name
-    cli = Cyoi::Cli::KeyPair.new([key_pair_name, settings_dir])
-    cli.execute!
-    reload_settings!
-
-    key_pair = Bosh::Bootstrap::KeyPair.new(settings_dir, settings.key_pair.name, settings.key_pair.private_key)
-    key_pair.execute!
-    settings.set("key_pair.path", key_pair.path)
-  end
-
   # TODO should this go inside Microbosh, like NetworkProvider is to Network?
   def microbosh_provider
     @microbosh_provider ||= begin
@@ -82,7 +70,7 @@ class Bosh::Bootstrap::Cli::Commands::Deploy
   end
 
   def perform_microbosh_deploy
-    settings.set("bosh.persistent_disk", 16384)
+    settings.set("bosh.persistent_disk", 4 * 1024)
     @microbosh ||= Bosh::Bootstrap::Microbosh.new(settings_dir, microbosh_provider)
     @microbosh.deploy(settings)
   end

data/lib/bosh-bootstrap/cli/commands/ssh.rb

@@ -14,6 +14,7 @@ class Bosh::Bootstrap::Cli::Commands::SSH
   include FileUtils
 
   def perform
+    setup_keypair
     sh "ssh -i #{private_key_path} #{user}@#{host}"
   end
 

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

@@ -2,10 +2,12 @@ module Bosh; module Bootstrap; module Cli; module Helpers; end; end; end; end
 
 require "bosh-bootstrap/cli/helpers/bundle"
 require "bosh-bootstrap/cli/helpers/interactions"
+require "bosh-bootstrap/cli/helpers/key_pair"
 require "bosh-bootstrap/cli/helpers/settings"
 
 module Bosh::Bootstrap::Cli::Helpers
   include Bosh::Bootstrap::Cli::Helpers::Bundle
   include Bosh::Bootstrap::Cli::Helpers::Interactions
+  include Bosh::Bootstrap::Cli::Helpers::KeyPair
   include Bosh::Bootstrap::Cli::Helpers::Settings
 end

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

@@ -0,0 +1,19 @@
+require "cyoi/cli/key_pair"
+require "readwritesettings"
+require "fileutils"
+
+module Bosh::Bootstrap::Cli::Helpers::KeyPair
+  include FileUtils
+
+  def setup_keypair
+    key_pair_name = settings.exists?("key_pair.name") || settings.bosh.name
+    cli = Cyoi::Cli::KeyPair.new([key_pair_name, settings_dir])
+    cli.execute!
+    reload_settings!
+
+    key_pair = Bosh::Bootstrap::KeyPair.new(settings_dir, settings.key_pair.name, settings.key_pair.private_key)
+    key_pair.execute!
+    settings.set("key_pair.path", key_pair.path)
+  end
+
+end

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

@@ -56,7 +56,7 @@ module Bosh::Bootstrap::MicroboshProviders
 
     def security_groups
       ["ssh",
-       "bosh_agent_http",
+       "bosh_agent_https",
        "bosh_nats_server",
        "bosh_blobstore",
        "bosh_director",

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

@@ -38,8 +38,11 @@ module Bosh::Bootstrap::MicroboshProviders
       settings.bosh.persistent_disk
     end
 
+    # TODO discover m1.microbosh via cyoi (a VM with ephemeral volume)
+    # Create m1.microboh with:
+    # nova flavor-create m1.microbosh 6 2048 20 2 --ephemeral 20 --rxtx-factor 1 --is-public true
     def resources_cloud_properties
-      {"instance_type"=>"m1.medium"}
+      {"instance_type"=>"m1.microbosh"}
     end
 
     def cloud_properties
@@ -63,7 +66,7 @@ module Bosh::Bootstrap::MicroboshProviders
 
     def security_groups
       ["ssh",
-       "bosh_agent_http",
+       "bosh_agent_https",
        "bosh_nats_server",
        "bosh_blobstore",
        "bosh_director",

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

@@ -17,7 +17,7 @@ module Bosh::Bootstrap::NetworkProviders
       {
         ssh: 22,
         bosh_nats_server: 4222,
-        bosh_agent_http: 6868,
+        bosh_agent_https: 6868,
         bosh_blobstore: 25250,
         bosh_director: 25555,
         bosh_registry: 25777

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

@@ -17,7 +17,7 @@ module Bosh::Bootstrap::NetworkProviders
       {
         ssh: 22,
         bosh_nats_server: 4222,
-        bosh_agent_http: 6868,
+        bosh_agent_https: 6868,
         bosh_blobstore: 25250,
         bosh_director: 25555,
         bosh_registry: 25777

data/lib/bosh-bootstrap/version.rb

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

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

@@ -6,7 +6,7 @@ network:
   type: dynamic
   vip: 1.2.3.4
 resources: 
-  persistent_disk: 16384
+  persistent_disk: 4096
   cloud_properties: 
     instance_type: m1.medium
     availability_zone: us-west-2a
@@ -20,7 +20,7 @@ cloud:
       ec2_endpoint: ec2.us-west-2.amazonaws.com
       default_security_groups: 
       - ssh
-      - bosh_agent_http
+      - bosh_agent_https
       - bosh_nats_server
       - bosh_blobstore
       - bosh_director

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

@@ -6,7 +6,7 @@ network:
   type: dynamic
   vip: 1.2.3.4
 resources: 
-  persistent_disk: 16384
+  persistent_disk: 4096
   cloud_properties: 
     instance_type: m1.medium
 cloud: 
@@ -19,7 +19,7 @@ cloud:
       ec2_endpoint: ec2.us-west-2.amazonaws.com
       default_security_groups: 
       - ssh
-      - bosh_agent_http
+      - bosh_agent_https
       - bosh_nats_server
       - bosh_blobstore
       - bosh_director

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

@@ -8,7 +8,7 @@ network:
   cloud_properties: 
     subnet: $SUBNET_ID$
 resources: 
-  persistent_disk: 16384
+  persistent_disk: 4096
   cloud_properties: 
     instance_type: m1.medium
 cloud: 
@@ -21,7 +21,7 @@ cloud:
       ec2_endpoint: ec2.us-west-2.amazonaws.com
       default_security_groups: 
       - ssh
-      - bosh_agent_http
+      - bosh_agent_https
       - bosh_nats_server
       - bosh_blobstore
       - bosh_director

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

@@ -8,7 +8,7 @@ network:
 resources: 
   persistent_disk: 4096
   cloud_properties: 
-    instance_type: m1.medium
+    instance_type: m1.microbosh
 cloud: 
   plugin: openstack
   properties: 
@@ -20,7 +20,7 @@ cloud:
       region: REGION
       default_security_groups: 
       - ssh
-      - bosh_agent_http
+      - bosh_agent_https
       - bosh_nats_server
       - bosh_blobstore
       - bosh_director

data/spec/unit/commands/ssh_spec.rb

@@ -13,6 +13,7 @@ describe Bosh::Bootstrap::Cli::Commands::SSH do
   it "runs ssh" do
     setting "address.ip", "1.2.3.4"
     setting "key_pair.path", "/path/to/private/key"
+    subject.should_receive(:setup_keypair)
     subject.should_receive(:sh).with("ssh -i /path/to/private/key vcap@1.2.3.4")
     subject.perform
   end

data/spec/unit/microbosh_providers/aws_spec.rb

@@ -19,7 +19,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
     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 "bosh.persistent_disk", 4096
 
     subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings)
 
@@ -38,7 +38,7 @@ describe Bosh::Bootstrap::MicroboshProviders::AWS do
     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 "bosh.persistent_disk", 4096
 
     subject = Bosh::Bootstrap::MicroboshProviders::AWS.new(microbosh_yml, settings)
 

data/spec/unit/network_providers/aws_spec.rb

@@ -17,7 +17,7 @@ describe Bosh::Bootstrap::NetworkProviders::AWS do
     expected_groups = [
       ["ssh", "ssh", ports: 22],
       ["bosh_nats_server", "bosh_nats_server", ports: 4222],
-      ["bosh_agent_http", "bosh_agent_http", ports: 6868],
+      ["bosh_agent_https", "bosh_agent_https", ports: 6868],
       ["bosh_blobstore", "bosh_blobstore", ports: 25250],
       ["bosh_director", "bosh_director", ports: 25555],
       ["bosh_registry", "bosh_registry", ports: 25777],

data/spec/unit/network_providers/openstack_spec.rb

@@ -16,7 +16,7 @@ describe Bosh::Bootstrap::NetworkProviders::OpenStack do
     expected_groups = [
       ["ssh", "ssh", ports: 22],
       ["bosh_nats_server", "bosh_nats_server", ports: 4222],
-      ["bosh_agent_http", "bosh_agent_http", ports: 6868],
+      ["bosh_agent_https", "bosh_agent_https", ports: 6868],
       ["bosh_blobstore", "bosh_blobstore", ports: 25250],
       ["bosh_director", "bosh_director", ports: 25555],
       ["bosh_registry", "bosh_registry", ports: 25777],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyoi
@@ -166,6 +166,7 @@ files:
 - lib/bosh-bootstrap/cli/helpers.rb
 - lib/bosh-bootstrap/cli/helpers/bundle.rb
 - lib/bosh-bootstrap/cli/helpers/interactions.rb
+- lib/bosh-bootstrap/cli/helpers/key_pair.rb
 - lib/bosh-bootstrap/cli/helpers/settings.rb
 - lib/bosh-bootstrap/key_pair.rb
 - lib/bosh-bootstrap/microbosh.rb
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1816725739124051396
+      hash: 1342872360376581564
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25