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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/lib/bosh/deployer/instance_manager.rb +23 -7
  2. data/lib/bosh/deployer/version.rb +1 -1
  3. metadata +19 -19
data/lib/bosh/deployer/instance_manager.rb CHANGED
@@ -71,7 +71,7 @@ module Bosh::Deployer
71
71
  end
72
72
 
73
73
  def exists?
74
- state.vm_cid != nil
74
+ [state.vm_cid, state.stemcell_cid, state.disk_cid].any?
75
75
  end
76
76
 
77
77
  def step(task)
@@ -177,18 +177,28 @@ module Bosh::Deployer
177
177
  def update(stemcell_tgz, stemcell_archive)
178
178
  result, message = has_pending_changes?(state, stemcell_tgz, stemcell_archive)
179
179
  @ui_messager.info(message)
180
-
181
180
  return unless result
182
181
 
183
182
  renderer.enter_stage('Prepare for update', 5)
184
- agent_stop
185
- detach_disk(state.disk_cid)
186
- delete_vm
183
+
184
+ # Reset stemcell and config sha1 before deploying
185
+ # to make sure that if any step in current deploy fails
186
+ # subsequent redeploys will not be skipped because sha1s matched
187
+ reset_saved_fingerprints
188
+
189
+ if state.vm_cid
190
+ agent_stop
191
+ detach_disk(state.disk_cid)
192
+ delete_vm
193
+ end
194
+
187
195
  # Do we always want to delete the stemcell?
188
196
  # What if we are redeploying to the same stemcell version just so
189
197
  # we can upgrade to a bigger persistent disk.
190
- # Perhaps use "--preserve" to skip the delete?
191
- delete_stemcell
198
+ if state.stemcell_cid
199
+ delete_stemcell
200
+ end
201
+
192
202
  create(stemcell_tgz, stemcell_archive)
193
203
  end
194
204
 
@@ -565,6 +575,12 @@ module Bosh::Deployer
565
575
  [false, :update_no_changes]
566
576
  end
567
577
 
578
+ def reset_saved_fingerprints
579
+ state.stemcell_sha1 = nil
580
+ state.config_sha1 = nil
581
+ save_state
582
+ end
583
+
568
584
  def save_fingerprints(stemcell_tgz, stemcell_archive)
569
585
  state.stemcell_sha1 = stemcell_archive ? stemcell_archive.sha1 : stemcell_tgz
570
586
  state.config_sha1 = @config_sha1
data/lib/bosh/deployer/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Bosh
4
4
  module Deployer
5
- VERSION = '1.5.0.pre.1154'
5
+ VERSION = '1.5.0.pre.1164'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh_cli_plugin_micro
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0.pre.1154
4
+ version: 1.5.0.pre.1164
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-10-23 00:00:00.000000000 Z
12
+ date: 2013-10-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sqlite3
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.5.0.pre.1154
37
+ version: 1.5.0.pre.1164
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- version: 1.5.0.pre.1154
45
+ version: 1.5.0.pre.1164
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh-stemcell
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ~>
52
52
  - !ruby/object:Gem::Version
53
- version: 1.5.0.pre.1154
53
+ version: 1.5.0.pre.1164
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 1.5.0.pre.1154
61
+ version: 1.5.0.pre.1164
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh-registry
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: 1.5.0.pre.1154
69
+ version: 1.5.0.pre.1164
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 1.5.0.pre.1154
77
+ version: 1.5.0.pre.1164
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: agent_client
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
82
82
  requirements:
83
83
  - - ~>
84
84
  - !ruby/object:Gem::Version
85
- version: 1.5.0.pre.1154
85
+ version: 1.5.0.pre.1164
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - ~>
92
92
  - !ruby/object:Gem::Version
93
- version: 1.5.0.pre.1154
93
+ version: 1.5.0.pre.1164
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: bosh_cpi
96
96
  requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
98
98
  requirements:
99
99
  - - ~>
100
100
  - !ruby/object:Gem::Version
101
- version: 1.5.0.pre.1154
101
+ version: 1.5.0.pre.1164
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
106
106
  requirements:
107
107
  - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: 1.5.0.pre.1154
109
+ version: 1.5.0.pre.1164
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: bosh_aws_cpi
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
114
114
  requirements:
115
115
  - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 1.5.0.pre.1154
117
+ version: 1.5.0.pre.1164
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
122
122
  requirements:
123
123
  - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 1.5.0.pre.1154
125
+ version: 1.5.0.pre.1164
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: bosh_openstack_cpi
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - ~>
132
132
  - !ruby/object:Gem::Version
133
- version: 1.5.0.pre.1154
133
+ version: 1.5.0.pre.1164
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
138
138
  requirements:
139
139
  - - ~>
140
140
  - !ruby/object:Gem::Version
141
- version: 1.5.0.pre.1154
141
+ version: 1.5.0.pre.1164
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: bosh_vcloud_cpi
144
144
  requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
162
162
  requirements:
163
163
  - - ~>
164
164
  - !ruby/object:Gem::Version
165
- version: 1.5.0.pre.1154
165
+ version: 1.5.0.pre.1164
166
166
  type: :runtime
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
170
170
  requirements:
171
171
  - - ~>
172
172
  - !ruby/object:Gem::Version
173
- version: 1.5.0.pre.1154
173
+ version: 1.5.0.pre.1164
174
174
  - !ruby/object:Gem::Dependency
175
175
  name: rspec-fire
176
176
  requirement: !ruby/object:Gem::Requirement
@@ -189,7 +189,7 @@ dependencies:
189
189
  version: '0'
190
190
  description: ! 'BOSH CLI plugin for Micro BOSH deployment
191
191
 
192
- c6bcb9'
192
+ 10c436'
193
193
  email: support@cloudfoundry.com
194
194
  executables: []
195
195
  extensions: []