bosh_deployer 1.0 → 1.0.1

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

@@ -271,8 +271,6 @@ module Bosh::Cli::Command
         end
 
         @deployer = Bosh::Deployer::InstanceManager.create(manifest)
-
-        $stderr.reopen("/dev/null") #silence ssl warnings
       end
 
       @deployer

data/lib/deployer.rb

@@ -17,7 +17,6 @@ require "common/common"
 require "common/thread_formatter"
 
 require "deployer/version"
-require "deployer/errors"
 require "deployer/helpers"
 require "deployer/config"
 require "deployer/instance_manager"

data/lib/deployer/helpers.rb

@@ -11,12 +11,8 @@ module Bosh::Deployer
     end
 
     def cloud_plugin(config)
-      if config["cloud"].nil?
-        raise ConfigError, "No cloud properties defined"
-      end
-      if config["cloud"]["plugin"].nil?
-        raise ConfigError, "No cloud plugin defined"
-      end
+      err "No cloud properties defined" if config["cloud"].nil?
+      err "No cloud plugin defined" if config["cloud"]["plugin"].nil?
 
       config["cloud"]["plugin"]
     end

data/lib/deployer/instance_manager.rb

@@ -37,7 +37,7 @@ module Bosh::Deployer
         begin
           require "deployer/instance_manager/#{plugin}"
         rescue LoadError
-          raise Error, "Could not find Provider Plugin: #{plugin}"
+          err "Could not find Provider Plugin: #{plugin}"
         end
         Bosh::Deployer::InstanceManager.const_get(plugin.capitalize).new(config)
       end
@@ -118,11 +118,9 @@ module Bosh::Deployer
     end
 
     def create(stemcell_tgz)
-      if state.vm_cid
-        raise ConfigError, "VM #{state.vm_cid} already exists"
-      end
+      err "VM #{state.vm_cid} already exists" if state.vm_cid
       if state.stemcell_cid && state.stemcell_cid != state.stemcell_name
-        raise ConfigError, "stemcell #{state.stemcell_cid} already exists"
+        err "stemcell #{state.stemcell_cid} already exists"
       end
 
       renderer.enter_stage("Deploy Micro BOSH", 11)
@@ -289,7 +287,7 @@ module Bosh::Deployer
 
     def detach_disk(disk_cid)
       unless disk_cid
-        raise "Error while detaching disk: unknown disk attached to instance"
+        err "Error while detaching disk: unknown disk attached to instance"
       end
 
       unmount_disk(disk_cid)
@@ -308,7 +306,9 @@ module Bosh::Deployer
       return if state.disk_cid.nil?
       agent_disk_cid = disk_info.first
       if agent_disk_cid != state.disk_cid
-        raise "instance #{state.vm_cid} has invalid disk: Agent reports #{agent_disk_cid} while deployer's record shows #{state.disk_cid}"
+        err "instance #{state.vm_cid} has invalid disk: " +
+          "Agent reports #{agent_disk_cid} while " +
+          "deployer's record shows #{state.disk_cid}"
       end
     end
 
@@ -465,9 +465,7 @@ module Bosh::Deployer
     end
 
     def delete_stemcell
-      unless state.stemcell_cid
-        raise ConfigError, "Cannot find existing stemcell"
-      end
+      err "Cannot find existing stemcell" unless state.stemcell_cid
 
       if state.stemcell_cid == state.stemcell_name
         step "Preserving stemcell" do
@@ -484,9 +482,8 @@ module Bosh::Deployer
     end
 
     def delete_vm
-      unless state.vm_cid
-        raise ConfigError, "Cannot find existing VM"
-      end
+      err "Cannot find existing VM" unless state.vm_cid
+
       step "Delete VM" do
         cloud.delete_vm(state.vm_cid)
       end
@@ -506,13 +503,13 @@ module Bosh::Deployer
 
     def load_apply_spec(dir)
       load_spec("#{dir}/apply_spec.yml") do
-        raise "this isn't a micro bosh stemcell - apply_spec.yml missing"
+        err "this isn't a micro bosh stemcell - apply_spec.yml missing"
       end
     end
 
     def load_stemcell_manifest(dir)
       load_spec("#{dir}/stemcell.MF") do
-        raise "this isn't a stemcell - stemcell.MF missing"
+        err "this isn't a stemcell - stemcell.MF missing"
       end
     end
 
@@ -557,7 +554,7 @@ module Bosh::Deployer
       output = `#{command} 2>&1`
       if $?.exitstatus != 0
         $stderr.puts output
-        raise "'#{command}' failed with exit status=#{$?.exitstatus} [#{output}]"
+        err "'#{command}' failed with exit status=#{$?.exitstatus} [#{output}]"
       end
     end
 

data/lib/deployer/instance_manager/aws.rb

@@ -30,12 +30,10 @@ module Bosh::Deployer
         @ssh_wait = properties["aws"]["ssh_wait"] || 60
 
         key = properties["aws"]["ec2_private_key"]
-        unless key
-          raise ConfigError, "Missing properties.aws.ec2_private_key"
-        end
+        err "Missing properties.aws.ec2_private_key" unless key
         @ssh_key = File.expand_path(key)
         unless File.exists?(@ssh_key)
-          raise ConfigError, "properties.aws.ec2_private_key '#{key}' does not exist"
+          err "properties.aws.ec2_private_key '#{key}' does not exist"
         end
 
         uri = URI.parse(properties["registry"]["endpoint"])
@@ -73,7 +71,7 @@ module Bosh::Deployer
         end
 
         unless has_aws_registry?
-          raise "aws_registry command not found - " +
+          err "aws_registry command not found - " +
             "run 'gem install bosh_aws_registry'"
         end
 
@@ -84,7 +82,7 @@ module Bosh::Deployer
         5.times do
           sleep 0.5
           if Process.waitpid(@registry_pid, Process::WNOHANG)
-            raise Error, "`#{cmd}` failed, exit status=#{$?.exitstatus}"
+            err "`#{cmd}` failed, exit status=#{$?.exitstatus}"
           end
         end
 
@@ -97,7 +95,7 @@ module Bosh::Deployer
           if timeout_time - Time.now.to_f > 0
             retry
           else
-            raise "Cannot access aws_registry: #{e.message}"
+            err "Cannot access aws_registry: #{e.message}"
           end
         end
         logger.info("aws_registry is ready on port #{@registry_port}")

data/lib/deployer/instance_manager/openstack.rb

@@ -30,12 +30,10 @@ module Bosh::Deployer
         @ssh_wait = properties["openstack"]["ssh_wait"] || 60
 
         key = properties["openstack"]["private_key"]
-        unless key
-          raise ConfigError, "Missing properties.openstack.private_key"
-        end
+        err "Missing properties.openstack.private_key" unless key
         @ssh_key = File.expand_path(key)
         unless File.exists?(@ssh_key)
-          raise ConfigError, "properties.openstack.private_key '#{key}' does not exist"
+          err "properties.openstack.private_key '#{key}' does not exist"
         end
 
         uri = URI.parse(properties["registry"]["endpoint"])
@@ -73,7 +71,7 @@ module Bosh::Deployer
         end
 
         unless has_openstack_registry?
-          raise "openstack_registry command not found - " +
+          err "openstack_registry command not found - " +
             "run 'gem install bosh_openstack_registry'"
         end
 
@@ -84,7 +82,7 @@ module Bosh::Deployer
         5.times do
           sleep 0.5
           if Process.waitpid(@registry_pid, Process::WNOHANG)
-            raise Error, "`#{cmd}` failed, exit status=#{$?.exitstatus}"
+            err "`#{cmd}` failed, exit status=#{$?.exitstatus}"
           end
         end
 
@@ -97,7 +95,7 @@ module Bosh::Deployer
           if timeout_time - Time.now.to_f > 0
             retry
           else
-            raise "Cannot access openstack_registry: #{e.message}"
+            err "Cannot access openstack_registry: #{e.message}"
           end
         end
         logger.info("openstack_registry is ready on port #{@registry_port}")
@@ -138,7 +136,7 @@ module Bosh::Deployer
                           |addr| addr.instance_id == server.id
                         }
           ip = floating_ip.nil? ? service_ip : floating_ip.ip
-          raise "Unable to discover bosh ip" if ip.nil?
+          err "Unable to discover bosh ip" if ip.nil?
 
           if ip != Config.bosh_ip
             Config.bosh_ip = ip
@@ -163,7 +161,7 @@ module Bosh::Deployer
           address = ip_addresses.select { |ip| ip["version"] == 4 }.first
           ip = address ? address["addr"] : nil
         end
-        raise "Unable to discover service ip" if ip.nil?
+        err "Unable to discover service ip" if ip.nil?
         ip
       end
 

data/lib/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = "1.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_deployer
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_cli
@@ -167,7 +167,6 @@ files:
 - lib/bosh/cli/commands/micro.rb
 - lib/deployer.rb
 - lib/deployer/config.rb
-- lib/deployer/errors.rb
 - lib/deployer/helpers.rb
 - lib/deployer/instance_manager.rb
 - lib/deployer/instance_manager/aws.rb
@@ -193,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4201748784491997897
+      hash: -1034060200626431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4201748784491997897
+      hash: -1034060200626431
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/deployer/errors.rb

@@ -1,11 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-module Bosh
-  module Deployer
-
-    class Error < StandardError; end
-
-    class ConfigError < StandardError; end
-
-  end
-end