bosh_deployer 0.5.1 → 0.6.0

data/lib/bosh/cli/commands/micro.rb

@@ -91,7 +91,7 @@ module Bosh::Cli::Command
           err("Invalid manifest format")
         end
 
-        stemcell = dig_hash(manifest, "cloud", "properties", "stemcell", "image_id")
+        stemcell = dig_hash(manifest, "resources", "cloud_properties", "image_id")
 
         if stemcell.nil?
           err "No stemcell provided"
@@ -102,6 +102,8 @@ module Bosh::Cli::Command
 
       desc = "`#{rel_path.green}' to `#{target_name.green}'"
 
+      deployer.check_dependencies
+
       if update
         unless deployer.exists?
           err "No existing instance to update"

data/lib/deployer/instance_manager/aws.rb

@@ -1,12 +1,12 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 
-require 'net/ssh'
-
 module Bosh::Deployer
   class InstanceManager
 
     class Aws < InstanceManager
 
+      include InstanceManagerHelpers
+
       def update_spec(spec)
         spec = super(spec)
         properties = spec["properties"]
@@ -184,74 +184,6 @@ module Bosh::Deployer
         end
       end
 
-      def process_exists?(pid)
-        begin
-          Process.kill(0, pid)
-        rescue Errno::ESRCH
-          false
-        end
-      end
-
-      def socket_readable?(ip, port)
-        socket = TCPSocket.new(ip, port)
-        if IO.select([socket], nil, nil, 5)
-          logger.debug("tcp socket #{ip}:#{port} is readable")
-          yield
-          true
-        else
-          false
-        end
-      rescue SocketError => e
-        logger.debug("tcp socket #{ip}:#{port} SocketError: #{e.inspect}")
-        sleep 1
-        false
-      rescue SystemCallError => e
-        logger.debug("tcp socket #{ip}:#{port} SystemCallError: #{e.inspect}")
-        sleep 1
-        false
-      ensure
-        socket.close if socket
-      end
-
-      def tunnel(port)
-        return if @session
-
-        ip = discover_bosh_ip
-
-        loop until socket_readable?(ip, @ssh_port) do
-          #sshd is up, sleep while host keys are generated
-          sleep @ssh_wait
-        end
-
-        lo = "127.0.0.1"
-        cmd = "ssh -R #{port}:#{lo}:#{port} #{@ssh_user}@#{ip}"
-
-        logger.info("Preparing for ssh tunnel: #{cmd}")
-        loop do
-          begin
-            @session = Net::SSH.start(ip, @ssh_user, :keys => [@ssh_key],
-                                      :paranoid => false)
-            logger.debug("ssh #{@ssh_user}@#{ip}: ESTABLISHED")
-            break
-          rescue => e
-            logger.debug("ssh start #{@ssh_user}@#{ip} failed: #{e.inspect}")
-            sleep 1
-          end
-        end
-
-        @session.forward.remote(port, lo, port)
-        logger.info("`#{cmd}` started: OK")
-
-        Thread.new do
-          begin
-            @session.loop { true }
-          rescue IOError => e
-            logger.debug("`#{cmd}` terminated: #{e.inspect}")
-            @session = nil
-          end
-        end
-      end
-
     end
   end
 end

data/lib/deployer/instance_manager/openstack.rb

@@ -1,12 +1,12 @@
 # Copyright (c) 2009-2012 VMware, Inc.
 
-require 'net/ssh'
-
 module Bosh::Deployer
   class InstanceManager
 
     class Openstack < InstanceManager
 
+      include InstanceManagerHelpers
+
       def update_spec(spec)
         spec = super(spec)
         properties = spec["properties"]
@@ -183,74 +183,6 @@ module Bosh::Deployer
         end
       end
 
-      def process_exists?(pid)
-        begin
-          Process.kill(0, pid)
-        rescue Errno::ESRCH
-          false
-        end
-      end
-
-      def socket_readable?(ip, port)
-        socket = TCPSocket.new(ip, port)
-        if IO.select([socket], nil, nil, 5)
-          logger.debug("tcp socket #{ip}:#{port} is readable")
-          yield
-          true
-        else
-          false
-        end
-      rescue SocketError => e
-        logger.debug("tcp socket #{ip}:#{port} SocketError: #{e.inspect}")
-        sleep 1
-        false
-      rescue SystemCallError => e
-        logger.debug("tcp socket #{ip}:#{port} SystemCallError: #{e.inspect}")
-        sleep 1
-        false
-      ensure
-        socket.close if socket
-      end
-
-      def tunnel(port)
-        return if @session
-
-        ip = discover_bosh_ip
-
-        loop until socket_readable?(ip, @ssh_port) do
-          #sshd is up, sleep while host keys are generated
-          sleep @ssh_wait
-        end
-
-        lo = "127.0.0.1"
-        cmd = "ssh -R #{port}:#{lo}:#{port} #{@ssh_user}@#{ip}"
-
-        logger.info("Preparing for ssh tunnel: #{cmd}")
-        loop do
-          begin
-            @session = Net::SSH.start(ip, @ssh_user, :keys => [@ssh_key],
-                                      :paranoid => false)
-            logger.debug("ssh #{@ssh_user}@#{ip}: ESTABLISHED")
-            break
-          rescue => e
-            logger.debug("ssh start #{@ssh_user}@#{ip} failed: #{e.inspect}")
-            sleep 1
-          end
-        end
-
-        @session.forward.remote(port, lo, port)
-        logger.info("`#{cmd}` started: OK")
-
-        Thread.new do
-          begin
-            @session.loop { true }
-          rescue IOError => e
-            logger.debug("`#{cmd}` terminated: #{e.inspect}")
-            @session = nil
-          end
-        end
-      end
-
     end
   end
 end

data/lib/deployer/instance_manager/vsphere.rb

@@ -35,5 +35,12 @@ module Bosh::Deployer
     def persistent_disk_changed?
       Config.resources['persistent_disk'] != disk_size(state.disk_cid)
     end
+
+    def check_dependencies
+      if Bosh::Common.which(%w[genisoimage mkisofs]).nil?
+        err("either of 'genisoimage' or 'mkisofs' commands must be present")
+      end
+    end
+
   end
 end

data/lib/deployer/instance_manager.rb

@@ -138,7 +138,8 @@ module Bosh::Deployer
         end
         save_state
       rescue => e
-        delete_stemcell
+        # only delete the stemcell if we were trying to upload it
+        delete_stemcell if is_tgz?(stemcell_tgz)
         raise e
       end
 
@@ -208,7 +209,7 @@ module Bosh::Deployer
 
         # override with values from the deployment manifest
         override = Config.cloud_options["properties"]["stemcell"]
-        properties["cloud_properties"].merge!(override) if override
+        override_property(properties, "cloud_properties", override)
 
         step "Uploading stemcell" do
           cloud.create_stemcell("#{stemcell}/image", properties["cloud_properties"])
@@ -300,7 +301,6 @@ module Bosh::Deployer
     def attach_missing_disk
       if state.disk_cid
         attach_disk(state.disk_cid, true)
-        save_state
       end
     end
 
@@ -338,6 +338,7 @@ module Bosh::Deployer
         # delete the old disk
         delete_disk(old_disk_cid, state.vm_cid)
       end
+    ensure
       save_state
     end
 
@@ -363,6 +364,11 @@ module Bosh::Deployer
         update_service_address(properties, service, service_ip)
       end
 
+      # health monitor does not listen to any ports, so there is no
+      # need to update the service address, but we still want to
+      # be able to override values in the apply_spec
+      override_property(properties, "hm", Config.spec_properties["hm"])
+
       spec
     end
 
@@ -384,6 +390,10 @@ module Bosh::Deployer
       bosh_ip
     end
 
+    def check_dependencies
+      # nothing to check, move on...
+    end
+
     private
 
     # update the agent service section from the contents of the apply_spec
@@ -393,9 +403,7 @@ module Bosh::Deployer
         svc = agent[service] ||= {}
         svc["address"] = address
 
-        if override = Config.agent_properties[service]
-          svc.merge!(override)
-        end
+        override_property(agent, service, Config.agent_properties[service])
       end
     end
 
@@ -403,9 +411,11 @@ module Bosh::Deployer
       return unless properties[service]
       properties[service]["address"] = address
 
-      if override = Config.spec_properties[service]
-        properties[service].merge!(override)
-      end
+      override_property(properties, service, Config.spec_properties[service])
+    end
+
+    def override_property(properties, service, override)
+      properties[service].merge!(override) if override
     end
 
     def bosh_ip

data/lib/deployer/instance_manager_helpers.rb

@@ -0,0 +1,78 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+require 'net/ssh'
+
+module Bosh::Deployer
+
+  module InstanceManagerHelpers
+
+    def process_exists?(pid)
+      begin
+        Process.kill(0, pid)
+      rescue Errno::ESRCH
+        false
+      end
+    end
+
+    def socket_readable?(ip, port)
+      socket = TCPSocket.new(ip, port)
+      if IO.select([socket], nil, nil, 5)
+        logger.debug("tcp socket #{ip}:#{port} is readable")
+        yield
+        true
+      else
+        false
+      end
+    rescue SocketError => e
+      logger.debug("tcp socket #{ip}:#{port} SocketError: #{e.inspect}")
+      sleep 1
+      false
+    rescue SystemCallError => e
+      logger.debug("tcp socket #{ip}:#{port} SystemCallError: #{e.inspect}")
+      sleep 1
+      false
+    ensure
+      socket.close if socket
+    end
+
+    def tunnel(port)
+      return if @session
+
+      ip = discover_bosh_ip
+
+      loop until socket_readable?(ip, @ssh_port) do
+        #sshd is up, sleep while host keys are generated
+        sleep @ssh_wait
+      end
+
+      lo = "127.0.0.1"
+      cmd = "ssh -R #{port}:#{lo}:#{port} #{@ssh_user}@#{ip}"
+
+      logger.info("Preparing for ssh tunnel: #{cmd}")
+      loop do
+        begin
+          @session = Net::SSH.start(ip, @ssh_user, :keys => [@ssh_key],
+                                    :paranoid => false)
+          logger.debug("ssh #{@ssh_user}@#{ip}: ESTABLISHED")
+          break
+        rescue => e
+          logger.debug("ssh start #{@ssh_user}@#{ip} failed: #{e.inspect}")
+          sleep 1
+        end
+      end
+
+      @session.forward.remote(port, lo, port)
+      logger.info("`#{cmd}` started: OK")
+
+      Thread.new do
+        begin
+          @session.loop { true }
+        rescue IOError => e
+          logger.debug("`#{cmd}` terminated: #{e.inspect}")
+          @session = nil
+        end
+      end
+    end
+
+  end
+end

data/lib/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

data/lib/deployer.rb

@@ -13,6 +13,7 @@ require "tmpdir"
 require "uuidtools"
 require "yaml"
 require "yajl"
+require "common/common"
 require "common/thread_formatter"
 
 require "deployer/version"
@@ -20,3 +21,4 @@ require "deployer/errors"
 require "deployer/helpers"
 require "deployer/config"
 require "deployer/instance_manager"
+require "deployer/instance_manager_helpers"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_deployer
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.19.5
-- !ruby/object:Gem::Dependency
-  name: bosh_common
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_registry
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: agent_client
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +173,7 @@ files:
 - lib/deployer/instance_manager/aws.rb
 - lib/deployer/instance_manager/openstack.rb
 - lib/deployer/instance_manager/vsphere.rb
+- lib/deployer/instance_manager_helpers.rb
 - lib/deployer/models/instance.rb
 - lib/deployer/version.rb
 - README.rdoc
@@ -208,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1238635242857856415
+      hash: -914290662432326556
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1238635242857856415
+      hash: -914290662432326556
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24