bosh-bootstrap 0.7.0 → 0.7.1

data/ChangeLog.md

@@ -1,11 +1,13 @@
 # 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 either AWS or OpenStack.
+
 ## v0.7
 
 Notable:
 
 * For existing users: please run "deploy --upgrade-deps" as new inception package (runit) added; and jazor/yaml_command CLIs installed
-* Forces microbosh stemcells 0.8.1 which work with public gems (latest public stemcell does not work with public gems)
+* Forces use of microbosh stemcell 0.8.1 which work with public gems (latest public stemcell does not work with public gems)
 
 Added:
 
@@ -26,6 +28,13 @@ Work in progress:
 * AWS VPC support was begin by the core BOSH team; though work has stopped sadly.
 * Growing number of specs mostly using Fog.mock! mode; tests being run on travis
 
+### v0.7.1
+
+* Make "deploy --private-key" option work [thx @dpw]
+* Add hypervisor for OpenStack stemcells [thx @frodenas]
+* Don't fail if `settings.fog_credentials.openstack_region` doesn't exist
+* Fix README for changed location of bosh-release [thx @scottfrederick]
+* No need to show  --latest-stemcell in README tutorial
 
 ## v0.6
 

data/README.md

@@ -33,6 +33,7 @@ This bootstrapper tool is distributed as a RubyGem for Ruby 1.9+.
 ```
 $ ruby -v
 ruby 1.9.3p385 ...
+$ gem install net-ssh -v 2.2.2
 $ gem install bosh-bootstrap
 ```
 
@@ -43,7 +44,7 @@ $ gem install bosh-bootstrap
 The first time you use `bosh-bootstrap` it will create everything necessary. The example output below includes user prompts.
 
 ```
-$ bosh-bootstrap deploy --latest-stemcell
+$ bosh-bootstrap deploy
 
 Stage 1: Choose infrastructure
 
@@ -187,7 +188,7 @@ A running BOSH, whether it is running on a single server or a cluster of servers
 * PostgreSQL
 * Redis
 
-When you deploy a BOSH using the BOSH Deployer (`bosh micro deploy`) or indirectly via the BOSH Bootstrapper, you are actually deploying a BOSH release that describes a BOSH called [bosh-release](https://github.com/cloudfoundry/bosh-release). The processes listed above are called "jobs" and you can see the full list of jobs inside a BOSH within the [jobs/ directory](https://github.com/cloudfoundry/bosh-release/jobs) of `bosh-release`.
+When you deploy a BOSH using the BOSH Deployer (`bosh micro deploy`) or indirectly via the BOSH Bootstrapper, you are actually deploying a BOSH release that describes a BOSH called [bosh-release](https://github.com/cloudfoundry/bosh/tree/master/release). The processes listed above are called "jobs" and you can see the full list of jobs inside a BOSH within the [jobs/ directory](https://github.com/cloudfoundry/bosh/tree/master/release/jobs) of the `bosh` repository.
 
 But you don't yet have a BOSH to deploy another BOSH.
 
@@ -208,7 +209,7 @@ $ bosh public stemcells --tag micro
 $ bosh download public stemcell micro-bosh-stemcell-aws-0.6.4.tgz
 ```
 
-The CloudFoundry BOSH team will release new public stemcells overtime. The BOSH Deployer allows you to upgrade to newer stemcells as easily as it is to deploy a Micro BOSH initially.
+The CloudFoundry BOSH team will release new public stemcells over time. The BOSH Deployer allows you to upgrade to newer stemcells as easily as it is to deploy a Micro BOSH initially.
 
 ```
 $ bosh micro deploy micro-bosh-stemcell-aws-0.6.4.tgz

data/lib/bosh-bootstrap/cli.rb

@@ -361,15 +361,9 @@ module Bosh::Bootstrap
 
         username = 'vcap'
         host = settings.inception[:host]
-        result = system Escape.shell_command(['ssh', "#{username}@#{host}", cmd].flatten.compact)
+        _, private_key_path = local_ssh_key_paths
+        result = system Escape.shell_command(['ssh', "-i", "#{private_key_path}", "#{username}@#{host}", cmd].flatten.compact)
         exit result
-
-        # TODO how to use the specific private_key_path as configured in settings
-        # _, private_key_path = local_ssh_key_paths
-        # exit system Escape.shell_command(['ssh', "-i #{private_key_path}", "#{username}@#{host}", cmd].compact)
-        #
-        # Currently this shows:
-        # Warning: Identity file  /Users/drnic/.ssh/id_rsa not accessible: No such file or directory.
       end
 
       def ensure_inception_vm
@@ -453,6 +447,9 @@ module Bosh::Bootstrap
         settings["git"] ||= {}
         settings["git"]["name"] ||= `git config user.name`.strip
         settings["git"]["email"] ||= `git config user.email`.strip
+        if settings["git"]["name"].empty? || settings["git"]["email"].empty?
+          error "Cannot find your git identity. Please set git user.name and user.email before proceeding"
+        end
 
         settings["bosh_git_source"] = options[:"edge-deployer"] # use bosh git repo instead of rubygems
 
@@ -721,7 +718,7 @@ module Bosh::Bootstrap
       end
 
       def prompt_openstack_region
-        default_region = settings.fog_credentials.openstack_region
+        default_region = settings["fog_credentials"] && settings["fog_credentials"]["openstack_region"]
         region = hl.ask("OpenStack Region (optional): ") { |q| q.default = default_region }
         settings[:region_code] = region.strip == "" ? nil : region
         return false unless settings[:region_code]
@@ -1127,7 +1124,8 @@ module Bosh::Bootstrap
       # for the target provider (aws, vsphere, openstack)
       # The name includes the version number.
       def micro_bosh_stemcell_name
-        @micro_bosh_stemcell_name ||= "micro-bosh-stemcell-#{provider_name}-#{known_stable_micro_bosh_stemcell_version}.tgz"
+        hypersivor = openstack? ? "-kvm" : ""
+        @micro_bosh_stemcell_name ||= "micro-bosh-stemcell-#{provider_name}#{hypersivor}-#{known_stable_micro_bosh_stemcell_version}.tgz"
       end
 
       def known_stable_micro_bosh_stemcell_version
@@ -1147,15 +1145,19 @@ module Bosh::Bootstrap
         say "Locating micro-bosh stemcell, running '#{bosh_stemcells_cmd}'..."
         #
         # The +bosh_stemcells_cmd+ has an output that looks like:
-        # +----------------------------------------+--------------------+
-        # | Name                                   | Tags               |
-        # +----------------------------------------+--------------------+
-        # | micro-bosh-stemcell-aws-0.6.4.tgz      | aws, micro, stable |
-        # | micro-bosh-stemcell-aws-0.7.0.tgz      | aws, micro, test   |
-        # | micro-bosh-stemcell-aws-0.8.1.tgz      | aws, micro, test   |
-        # | micro-bosh-stemcell-aws-1.5.0.pre1.tgz | aws, micro         |
-        # | micro-bosh-stemcell-aws-1.5.0.pre2.tgz | aws, micro         |
-        # +----------------------------------------+--------------------+
+        # +--------------------------------------------------+-----------------------------+
+        # | Name                                             | Tags                        |
+        # +--------------------------------------------------+-----------------------------+
+        # | micro-bosh-stemcell-aws-0.6.4.tgz                | aws, micro, stable          |
+        # | micro-bosh-stemcell-aws-0.7.0.tgz                | aws, micro, test            |
+        # | micro-bosh-stemcell-aws-0.8.1.tgz                | aws, micro, test            |
+        # | micro-bosh-stemcell-aws-1.5.0.pre1.tgz           | aws, micro                  |
+        # | micro-bosh-stemcell-aws-1.5.0.pre2.tgz           | aws, micro                  |
+        # | micro-bosh-stemcell-openstack-0.7.0.tgz          | openstack, micro, test      |
+        # | micro-bosh-stemcell-openstack-kvm-0.8.1.tgz      | openstack, kvm, micro, test |
+        # | micro-bosh-stemcell-openstack-kvm-1.5.0.pre1.tgz | openstack, kvm, micro       |
+        # | micro-bosh-stemcell-openstack-kvm-1.5.0.pre2.tgz | openstack, kvm, micro       |
+        # +--------------------------------------------------+-----------------------------+
         #
         # So to get the latest version for the filter tags,
         # get the Name field, reverse sort, and return the first item

data/lib/bosh-bootstrap/commander/remote_server.rb

@@ -77,7 +77,7 @@ class Bosh::Bootstrap::Commander::RemoteServer
       file << contents
       file.flush
       logfile.puts "uploading #{remote_path} to Inception VM"
-      Net::SCP.upload!(host, upload_as_user, file.path, remote_path)
+      Net::SCP.upload!(host, upload_as_user, file.path, remote_path, ssh: { keys: keys_array })
     end
     true
   rescue StandardError => e
@@ -102,8 +102,7 @@ class Bosh::Bootstrap::Commander::RemoteServer
       "bash -lc 'sudo /usr/bin/env PATH=$PATH #{remote_path}'"
     ]
     script_output = ""
-    keys = [private_key_path] # path to local private key being used
-    results = Fog::SSH.new(host, username, keys: keys).run(commands) do |stdout, stderr|
+    results = Fog::SSH.new(host, username, keys: keys_array).run(commands) do |stdout, stderr|
       [stdout, stderr].flatten.each do |data|
         logfile << data
         script_output << data
@@ -114,8 +113,14 @@ class Bosh::Bootstrap::Commander::RemoteServer
     [script_output, result_success]
   end
 
+  # Produce the :keys option for Net::SSH
+  def keys_array
+    # path to local private key being used
+    [private_key_path]
+  end
+
   def run_remote_command(command, username)
-    Net::SSH.start(host, username) do |ssh|
+    Net::SSH.start(host, username, keys: keys_array) do |ssh|
       ssh.exec!("bash -lc '#{command}'") do |channel, stream, data|
         logfile << data
       end

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/spec/unit/aws_spec.rb

@@ -28,6 +28,8 @@ describe "AWS deployment" do
     setting "fog_credentials", @fog_credentials.stringify_keys
     setting "bosh.salted_password", "pepper"
     setting "bosh.persistent_disk", 16384
+    setting "git.name", "Dr Nic Williams"
+    setting "git.email", "drnicwilliams@gmail.com"
   end
 
   # used by +SettingsSetter+ to access the settings

data/spec/unit/cli_spec.rb

@@ -10,6 +10,8 @@ describe Bosh::Bootstrap do
     ENV['MANIFEST'] = File.expand_path("../../../tmp/test-manifest.yml", __FILE__)
     rm_rf(ENV['MANIFEST'])
     @cmd = Bosh::Bootstrap::Cli.new
+    setting "git.name", "Dr Nic Williams"
+    setting "git.email", "drnicwilliams@gmail.com"
   end
 
   # stub out all stages except a specific one
@@ -56,8 +58,6 @@ describe Bosh::Bootstrap do
 
     it "stage 4 - prepare inception VM" do
       testing_stage(4)
-      setting "git.name", "Dr Nic Williams"
-      setting "git.email", "drnicwilliams@gmail.com"
       setting "inception.username", "ubuntu"
       setting "bosh.password", "UNSALTED"
       @cmd.should_receive(:run_server).and_return(true)
@@ -109,9 +109,19 @@ describe Bosh::Bootstrap do
     # get the Name field, reverse sort, and return the first item
     it "should return the latest stable stemcell by default for AWS" do
       @cmd.settings["bosh_provider"] = "aws"
+      @cmd.settings["fog_credentials"] = {}
+      @cmd.settings["fog_credentials"]["provider"] = "aws"
       @cmd.should_receive(:known_stable_micro_bosh_stemcell_version).and_return("0.8.1")
       @cmd.micro_bosh_stemcell_name.should == "micro-bosh-stemcell-aws-0.8.1.tgz"
     end
+
+    it "should return the latest stable stemcell by default for OpenStack" do
+      @cmd.settings["bosh_provider"] = "openstack"
+      @cmd.settings["fog_credentials"] = {}
+      @cmd.settings["fog_credentials"]["provider"] = "OpenStack"
+      @cmd.should_receive(:known_stable_micro_bosh_stemcell_version).and_return("0.8.1")
+      @cmd.micro_bosh_stemcell_name.should == "micro-bosh-stemcell-openstack-kvm-0.8.1.tgz"
+    end
   end
 
 end

data/spec/unit/cli_ssh_spec.rb

@@ -19,19 +19,20 @@ describe Bosh::Bootstrap do
     before do
       @cmd.settings["inception"] = {}
       @cmd.settings["inception"]["host"] = "5.5.5.5"
+      @private_key_path = File.join(ENV['HOME'], ".ssh", "id_rsa")
     end
 
     describe "normal" do
       it "launches ssh session" do
         @cmd.should_receive(:exit)
         @cmd.should_receive(:system).
-          with("ssh vcap@5.5.5.5")
+          with("ssh -i #{@private_key_path} vcap@5.5.5.5")
         @cmd.ssh
       end
       it "runs ssh command" do
         @cmd.should_receive(:exit)
         @cmd.should_receive(:system).
-          with("ssh vcap@5.5.5.5 'some command'")
+          with("ssh -i #{@private_key_path} vcap@5.5.5.5 'some command'")
         @cmd.ssh("some command")
       end
     end
@@ -40,7 +41,7 @@ describe Bosh::Bootstrap do
       it "launches ssh session" do
         @cmd.should_receive(:exit)
         @cmd.should_receive(:system).
-          with("ssh vcap@5.5.5.5 -t 'tmux attach || tmux new-session'")
+          with("ssh -i #{@private_key_path} vcap@5.5.5.5 -t 'tmux attach || tmux new-session'")
         @cmd.tmux
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -313,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3958535390595631478
+      hash: 2218589769012560406
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25