bosh_cli_plugin_micro 1.5.0.pre.1154 → 1.5.0.pre.1164

data/lib/bosh/deployer/instance_manager.rb

@@ -71,7 +71,7 @@ module Bosh::Deployer
     end
 
     def exists?
-      state.vm_cid != nil
+      [state.vm_cid, state.stemcell_cid, state.disk_cid].any?
     end
 
     def step(task)
@@ -177,18 +177,28 @@ module Bosh::Deployer
     def update(stemcell_tgz, stemcell_archive)
       result, message = has_pending_changes?(state, stemcell_tgz, stemcell_archive)
       @ui_messager.info(message)
-
       return unless result
 
       renderer.enter_stage('Prepare for update', 5)
-      agent_stop
-      detach_disk(state.disk_cid)
-      delete_vm
+
+      # Reset stemcell and config sha1 before deploying
+      # to make sure that if any step in current deploy fails
+      # subsequent redeploys will not be skipped because sha1s matched
+      reset_saved_fingerprints
+
+      if state.vm_cid
+        agent_stop
+        detach_disk(state.disk_cid)
+        delete_vm
+      end
+
       # Do we always want to delete the stemcell?
       # What if we are redeploying to the same stemcell version just so
       # we can upgrade to a bigger persistent disk.
-      # Perhaps use "--preserve" to skip the delete?
-      delete_stemcell
+      if state.stemcell_cid
+        delete_stemcell
+      end
+
       create(stemcell_tgz, stemcell_archive)
     end
 
@@ -565,6 +575,12 @@ module Bosh::Deployer
       [false, :update_no_changes]
     end
 
+    def reset_saved_fingerprints
+      state.stemcell_sha1 = nil
+      state.config_sha1 = nil
+      save_state
+    end
+
     def save_fingerprints(stemcell_tgz, stemcell_archive)
       state.stemcell_sha1 = stemcell_archive ? stemcell_archive.sha1 : stemcell_tgz
       state.config_sha1 = @config_sha1

data/lib/bosh/deployer/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Deployer
-    VERSION = '1.5.0.pre.1154'
+    VERSION = '1.5.0.pre.1164'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli_plugin_micro
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1154
+  version: 1.5.0.pre.1164
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
 - !ruby/object:Gem::Dependency
   name: bosh-stemcell
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
 - !ruby/object:Gem::Dependency
   name: agent_client
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
 - !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.5.0.pre.1154
+        version: 1.5.0.pre.1164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1154
+        version: 1.5.0.pre.1164
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH CLI plugin for Micro BOSH deployment
 
-  c6bcb9'
+  10c436'
 email: support@cloudfoundry.com
 executables: []
 extensions: []