bosh-director 1.1744.0 → 1.1750.0

data/lib/bosh/director/config.rb

@@ -33,7 +33,8 @@ module Bosh::Director
         :current_job,
         :encryption,
         :fix_stateful_nodes,
-        :enable_snapshots
+        :enable_snapshots,
+        :max_vm_create_tries,
       ]
 
       CONFIG_OPTIONS.each do |option|
@@ -59,6 +60,7 @@ module Bosh::Director
       end
 
       def configure(config)
+        @max_vm_create_tries = Integer(config.fetch('max_vm_create_tries', 5))
 
         @base_dir = config["dir"]
         FileUtils.mkdir_p(@base_dir)

data/lib/bosh/director/instance_updater.rb

@@ -219,16 +219,19 @@ module Bosh::Director
                              @resource_pool_spec.cloud_properties,
                              @instance.network_settings, disks,
                              @resource_pool_spec.env)
-      @instance.model.vm = @vm
-      @instance.model.save
 
-      agent.wait_until_ready
-    rescue => e
-      if @vm
-        @logger.error("error during create_vm(), deleting vm #{@vm.cid}")
-        delete_vm
+      begin
+        @instance.model.vm = @vm
+        @instance.model.save
+
+        agent.wait_until_ready
+      rescue => e
+        if @vm
+          @logger.error("error during create_vm(), deleting vm #{@vm.cid}")
+          delete_vm
+        end
+        raise e
       end
-      raise e
     end
 
     def apply_state(state)

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.1744.0'
+    VERSION = '1.1750.0'
   end
 end

data/lib/bosh/director/vm_creator.rb

@@ -5,9 +5,6 @@ module Bosh::Director
   class VmCreator
     include EncryptionHelper
 
-    # this is used to retry VM creation on clouds that are unreliable (e.g. AWS)
-    MAX_CREATE_VM_TRIES = 5
-
     def self.create(*args)
       new.create(*args)
     end
@@ -34,8 +31,8 @@ module Bosh::Director
 
       if Config.encryption?
         credentials = generate_agent_credentials
-        env["bosh"] ||= {}
-        env["bosh"]["credentials"] = credentials
+        env['bosh'] ||= {}
+        env['bosh']['credentials'] = credentials
         options[:credentials] = credentials
       end
 
@@ -45,7 +42,7 @@ module Bosh::Director
       rescue Bosh::Clouds::VMCreationFailed => e
         count += 1
         logger.error("failed to create VM, retrying (#{count})")
-        retry if e.ok_to_retry && count < MAX_CREATE_VM_TRIES
+        retry if e.ok_to_retry && count < Config.max_vm_create_tries
         raise e
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.1744.0
+  version: 1.1750.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1744.0
+        version: 1.1750.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  7dfce5'
+  5212a9'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -712,7 +712,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1167049547300900363
+      hash: 2997654396825944747
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23