bosh-director 1.2801.0 → 1.2807.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/lib/bosh/director/errors.rb +1 -0
  2. data/lib/bosh/director/jobs/update_release.rb +13 -6
  3. data/lib/bosh/director/version.rb +1 -1
  4. data/lib/cloud/dummy.rb +11 -5
  5. metadata +24 -24
data/lib/bosh/director/errors.rb CHANGED
@@ -111,6 +111,7 @@ module Bosh::Director
111
111
  JobInvalidPropertyMapping = err(80009)
112
112
  JobIncompatibleSpecs = err(80010)
113
113
  JobPackageCollision = err(80011)
114
+ JobInvalidPackageSpec = err(80012)
114
115
 
115
116
  ResourceError = err(100001)
116
117
  ResourceNotFound = err(100002, NOT_FOUND)
data/lib/bosh/director/jobs/update_release.rb CHANGED
@@ -438,14 +438,21 @@ module Bosh::Director
438
438
  template.blobstore_id = BlobUtil.create_blob(job_tgz)
439
439
 
440
440
  package_names = []
441
- job_manifest["packages"].each do |package_name|
442
- package = @packages[package_name]
443
- if package.nil?
444
- raise JobMissingPackage,
445
- "Job `#{template.name}' is referencing " +
441
+ if job_manifest["packages"]
442
+ unless job_manifest["packages"].is_a?(Array)
443
+ raise JobInvalidPackageSpec,
444
+ "Job `#{template.name}' has invalid package spec format"
445
+ end
446
+
447
+ job_manifest["packages"].each do |package_name|
448
+ package = @packages[package_name]
449
+ if package.nil?
450
+ raise JobMissingPackage,
451
+ "Job `#{template.name}' is referencing " +
446
452
  "a missing package `#{package_name}'"
453
+ end
454
+ package_names << package.name
447
455
  end
448
- package_names << package.name
449
456
  end
450
457
  template.package_names = package_names
451
458
 
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2801.0'
3
+ VERSION = '1.2807.0'
4
4
  end
5
5
  end
data/lib/cloud/dummy.rb CHANGED
@@ -18,6 +18,8 @@ module Bosh
18
18
  end
19
19
 
20
20
  @running_vms_dir = File.join(@base_dir, 'running_vms')
21
+ @tmp_dir = File.join(@base_dir, 'tmp')
22
+ FileUtils.mkdir_p(@tmp_dir)
21
23
 
22
24
  @logger = Logging::Logger.new('DummyCPI')
23
25
  @logger.add_appenders(Logging.appenders.io(
@@ -184,11 +186,15 @@ module Bosh
184
186
  agent_cmd = agent_cmd(agent_id)
185
187
  agent_log = agent_log_path(agent_id)
186
188
 
187
- agent_pid = Process.spawn(*agent_cmd, {
188
- chdir: agent_base_dir(agent_id),
189
- out: agent_log,
190
- err: agent_log,
191
- })
189
+ agent_pid = Process.spawn(
190
+ { 'TMPDIR' => @tmp_dir },
191
+ *agent_cmd,
192
+ {
193
+ chdir: agent_base_dir(agent_id),
194
+ out: agent_log,
195
+ err: agent_log,
196
+ }
197
+ )
192
198
 
193
199
  Process.detach(agent_pid)
194
200
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2801.0
4
+ version: 1.2807.0
5
5
  prerelease:
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: 2014-12-24 00:00:00.000000000 Z
12
+ date: 2014-12-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.2801.0
37
+ version: 1.2807.0
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.2801.0
45
+ version: 1.2807.0
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh-core
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.2801.0
53
+ version: 1.2807.0
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.2801.0
61
+ version: 1.2807.0
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh-director-core
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.2801.0
69
+ version: 1.2807.0
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.2801.0
77
+ version: 1.2807.0
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: bosh_common
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.2801.0
85
+ version: 1.2807.0
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.2801.0
93
+ version: 1.2807.0
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: bosh-template
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.2801.0
101
+ version: 1.2807.0
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.2801.0
109
+ version: 1.2807.0
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: bosh_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.2801.0
117
+ version: 1.2807.0
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.2801.0
125
+ version: 1.2807.0
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.2801.0
133
+ version: 1.2807.0
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.2801.0
141
+ version: 1.2807.0
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: bosh_aws_cpi
144
144
  requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
146
146
  requirements:
147
147
  - - ~>
148
148
  - !ruby/object:Gem::Version
149
- version: 1.2801.0
149
+ version: 1.2807.0
150
150
  type: :runtime
151
151
  prerelease: false
152
152
  version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
154
154
  requirements:
155
155
  - - ~>
156
156
  - !ruby/object:Gem::Version
157
- version: 1.2801.0
157
+ version: 1.2807.0
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: bosh_vsphere_cpi
160
160
  requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
162
162
  requirements:
163
163
  - - ~>
164
164
  - !ruby/object:Gem::Version
165
- version: 1.2801.0
165
+ version: 1.2807.0
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.2801.0
173
+ version: 1.2807.0
174
174
  - !ruby/object:Gem::Dependency
175
175
  name: bosh_warden_cpi
176
176
  requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
178
178
  requirements:
179
179
  - - ~>
180
180
  - !ruby/object:Gem::Version
181
- version: 1.2801.0
181
+ version: 1.2807.0
182
182
  type: :runtime
183
183
  prerelease: false
184
184
  version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
186
186
  requirements:
187
187
  - - ~>
188
188
  - !ruby/object:Gem::Version
189
- version: 1.2801.0
189
+ version: 1.2807.0
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: bosh_vcloud_cpi
192
192
  requirement: !ruby/object:Gem::Requirement
@@ -525,7 +525,7 @@ dependencies:
525
525
  version: '0'
526
526
  description: ! 'BOSH Director
527
527
 
528
- 7d6c56'
528
+ 0b041c'
529
529
  email: support@cloudfoundry.com
530
530
  executables:
531
531
  - bosh-director
@@ -793,7 +793,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
793
793
  version: '0'
794
794
  segments:
795
795
  - 0
796
- hash: -3387379259615309344
796
+ hash: -3015350443129074724
797
797
  requirements: []
798
798
  rubyforge_project:
799
799
  rubygems_version: 1.8.23