bosh-director 1.2657.0 → 1.2669.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/director.rb +1 -1
  3. data/lib/bosh/director/deployment_plan/job.rb +2 -1
  4. data/lib/bosh/director/deployment_plan/job_spec_parser.rb +2 -1
  5. data/lib/bosh/director/instance_updater.rb +1 -1
  6. data/lib/bosh/director/instance_updater/preparer.rb +15 -9
  7. data/lib/bosh/director/instance_updater/vm_updater.rb +1 -1
  8. data/lib/bosh/director/version.rb +1 -1
  9. metadata +39 -25
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cdcdf18b4a10ad040780c48117cc826c1b7b8674
4
- data.tar.gz: 3ee8f6aeddedff97bbd5388c7224589201979a88
3
+ metadata.gz: f1a0dd4d44c9581c591ed62d3886b46cedbbc9c7
4
+ data.tar.gz: 6787f81c29acecd64e6af5728483f3992b326dc7
5
5
  SHA512:
6
- metadata.gz: c83ac2ceb6dee4b5c69d8cd6b55931fe4af5e28da27370114585faa1e1a1e145b2156980f82677345ac679bb91f4dab7b09a100b27b0438e356cf8292c3af724
7
- data.tar.gz: 6e477188716156e6c6fc5d5ad85757dcea365418107212d3c8d1afbebfa01c30d730d1e01cbb8f815dbabb627ee0302a3c7c2ae57d8f9c8cc64e99ee2e6e8354
6
+ metadata.gz: cd39e95f2c457f52577c695bd95f5696576cfd0b0204855367d91c84d3c44e3460c488bd1b2751a55272e59c997820877db20bb8c3a6576d9850de2ef52f6907
7
+ data.tar.gz: 537b409d09d1ead834366d379dd2f4287e1bb5be4f5654c41b6f30a27585d4b8ea8fefb43ca65b16d73b27f6144fd739dbe27c6f2dc9789f3ed0267c05ec58f6
data/lib/bosh/director.rb CHANGED
@@ -23,7 +23,7 @@ require 'time'
23
23
  require 'zlib'
24
24
 
25
25
  require 'common/exec'
26
- require 'common/properties'
26
+ require 'bosh/template/evaluation_context'
27
27
  require 'common/version/release_version_list'
28
28
 
29
29
  require 'bcrypt'
data/lib/bosh/director/deployment_plan/job.rb CHANGED
@@ -1,9 +1,10 @@
1
1
  require 'bosh/director/deployment_plan/job_spec_parser'
2
+ require 'bosh/template/property_helper'
2
3
 
3
4
  module Bosh::Director
4
5
  module DeploymentPlan
5
6
  class Job
6
- include Bosh::Common::PropertyHelper
7
+ include Bosh::Template::PropertyHelper
7
8
 
8
9
  VALID_LIFECYCLE_PROFILES = %w(service errand)
9
10
  DEFAULT_LIFECYCLE_PROFILE = 'service'
data/lib/bosh/director/deployment_plan/job_spec_parser.rb CHANGED
@@ -1,11 +1,12 @@
1
1
  require 'common/deep_copy'
2
+ require 'bosh/template/property_helper'
2
3
 
3
4
  module Bosh::Director
4
5
  module DeploymentPlan
5
6
  class JobSpecParser
6
7
  include DnsHelper
7
8
  include ValidationHelper
8
- include Bosh::Common::PropertyHelper
9
+ include Bosh::Template::PropertyHelper
9
10
  include IpUtil
10
11
 
11
12
  # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan
data/lib/bosh/director/instance_updater.rb CHANGED
@@ -57,7 +57,7 @@ module Bosh::Director
57
57
  return
58
58
  end
59
59
 
60
- step { Preparer.new(@instance, agent).prepare }
60
+ step { Preparer.new(@instance, agent, @logger).prepare }
61
61
  step { stop }
62
62
  step { take_snapshot }
63
63
 
data/lib/bosh/director/instance_updater/preparer.rb CHANGED
@@ -1,20 +1,26 @@
1
1
  module Bosh::Director
2
2
  class InstanceUpdater::Preparer
3
- def initialize(instance, agent_client)
3
+ def initialize(instance, agent_client, logger)
4
4
  @instance = instance
5
5
  @agent_client = agent_client
6
+ @logger = logger
6
7
  end
7
8
 
8
9
  def prepare
9
- @agent_client.prepare(@instance.spec) unless detached?
10
+ # If resource pool has changed or instance will be detached
11
+ # there is no point in preparing current VM for future since it will be destroyed.
12
+ if !@instance.resource_pool_changed? && @instance.state != 'detached'
13
+ @agent_client.prepare(@instance.spec)
14
+ end
10
15
  rescue RpcRemoteException => e
11
- raise unless e.message =~ /unknown message/
12
- end
13
-
14
- private
15
-
16
- def detached?
17
- @instance.state == 'detached'
16
+ if e.message =~ /unknown message/
17
+ # It's ok if agent does not support prepare optimization
18
+ @logger.warn("Ignoring prepare 'unknown message' error from the agent: #{e.inspect}")
19
+ else
20
+ # Prepare is really an optimization to a deployment process.
21
+ # It should not prevent deploy from continuing on and trying to actually finish an update.
22
+ @logger.warn("Ignoring prepare error from the agent: #{e.inspect}")
23
+ end
18
24
  end
19
25
  end
20
26
  end
data/lib/bosh/director/instance_updater/vm_updater.rb CHANGED
@@ -11,7 +11,7 @@ module Bosh::Director
11
11
  end
12
12
 
13
13
  def update(new_disk_cid)
14
- unless @instance.resource_pool_changed? || new_disk_cid
14
+ if !@instance.resource_pool_changed? && !new_disk_cid
15
15
  @logger.info('Skipping VM update')
16
16
  return [@vm_model, @agent_client]
17
17
  end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2657.0'
3
+ VERSION = '1.2669.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2657.0
4
+ version: 1.2669.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-24 00:00:00.000000000 Z
11
+ date: 2014-07-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt-ruby
@@ -30,140 +30,154 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2657.0
33
+ version: 1.2669.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.2657.0
40
+ version: 1.2669.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-core
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.2657.0
47
+ version: 1.2669.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.2657.0
54
+ version: 1.2669.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bosh-director-core
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.2657.0
61
+ version: 1.2669.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.2657.0
68
+ version: 1.2669.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh_common
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.2657.0
75
+ version: 1.2669.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.2657.0
82
+ version: 1.2669.0
83
+ - !ruby/object:Gem::Dependency
84
+ name: bosh-template
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - "~>"
88
+ - !ruby/object:Gem::Version
89
+ version: 1.2669.0
90
+ type: :runtime
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - "~>"
95
+ - !ruby/object:Gem::Version
96
+ version: 1.2669.0
83
97
  - !ruby/object:Gem::Dependency
84
98
  name: bosh_cpi
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - "~>"
88
102
  - !ruby/object:Gem::Version
89
- version: 1.2657.0
103
+ version: 1.2669.0
90
104
  type: :runtime
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - "~>"
95
109
  - !ruby/object:Gem::Version
96
- version: 1.2657.0
110
+ version: 1.2669.0
97
111
  - !ruby/object:Gem::Dependency
98
112
  name: bosh_openstack_cpi
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - "~>"
102
116
  - !ruby/object:Gem::Version
103
- version: 1.2657.0
117
+ version: 1.2669.0
104
118
  type: :runtime
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - "~>"
109
123
  - !ruby/object:Gem::Version
110
- version: 1.2657.0
124
+ version: 1.2669.0
111
125
  - !ruby/object:Gem::Dependency
112
126
  name: bosh_aws_cpi
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - "~>"
116
130
  - !ruby/object:Gem::Version
117
- version: 1.2657.0
131
+ version: 1.2669.0
118
132
  type: :runtime
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - "~>"
123
137
  - !ruby/object:Gem::Version
124
- version: 1.2657.0
138
+ version: 1.2669.0
125
139
  - !ruby/object:Gem::Dependency
126
140
  name: bosh_vsphere_cpi
127
141
  requirement: !ruby/object:Gem::Requirement
128
142
  requirements:
129
143
  - - "~>"
130
144
  - !ruby/object:Gem::Version
131
- version: 1.2657.0
145
+ version: 1.2669.0
132
146
  type: :runtime
133
147
  prerelease: false
134
148
  version_requirements: !ruby/object:Gem::Requirement
135
149
  requirements:
136
150
  - - "~>"
137
151
  - !ruby/object:Gem::Version
138
- version: 1.2657.0
152
+ version: 1.2669.0
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: bosh_warden_cpi
141
155
  requirement: !ruby/object:Gem::Requirement
142
156
  requirements:
143
157
  - - "~>"
144
158
  - !ruby/object:Gem::Version
145
- version: 1.2657.0
159
+ version: 1.2669.0
146
160
  type: :runtime
147
161
  prerelease: false
148
162
  version_requirements: !ruby/object:Gem::Requirement
149
163
  requirements:
150
164
  - - "~>"
151
165
  - !ruby/object:Gem::Version
152
- version: 1.2657.0
166
+ version: 1.2669.0
153
167
  - !ruby/object:Gem::Dependency
154
168
  name: bosh_vcloud_cpi
155
169
  requirement: !ruby/object:Gem::Requirement
156
170
  requirements:
157
171
  - - "~>"
158
172
  - !ruby/object:Gem::Version
159
- version: 0.5.4
173
+ version: 0.5.5
160
174
  type: :runtime
161
175
  prerelease: false
162
176
  version_requirements: !ruby/object:Gem::Requirement
163
177
  requirements:
164
178
  - - "~>"
165
179
  - !ruby/object:Gem::Version
166
- version: 0.5.4
180
+ version: 0.5.5
167
181
  - !ruby/object:Gem::Dependency
168
182
  name: eventmachine
169
183
  requirement: !ruby/object:Gem::Requirement
@@ -198,14 +212,14 @@ dependencies:
198
212
  requirements:
199
213
  - - '='
200
214
  - !ruby/object:Gem::Version
201
- version: 2.2.4
215
+ version: 2.4.0
202
216
  type: :runtime
203
217
  prerelease: false
204
218
  version_requirements: !ruby/object:Gem::Requirement
205
219
  requirements:
206
220
  - - '='
207
221
  - !ruby/object:Gem::Version
208
- version: 2.2.4
222
+ version: 2.4.0
209
223
  - !ruby/object:Gem::Dependency
210
224
  name: mono_logger
211
225
  requirement: !ruby/object:Gem::Requirement
@@ -446,7 +460,7 @@ dependencies:
446
460
  version: '0'
447
461
  description: |-
448
462
  BOSH Director
449
- a6c527
463
+ bf0b96
450
464
  email: support@cloudfoundry.com
451
465
  executables:
452
466
  - bosh-director