bosh-director 1.2671.0 → 1.2681.0

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/db/migrations/director/20140731215410_increase_text_limit_for_data_columns.rb +52 -0
  3. data/lib/bosh/director/models/compiled_package.rb +6 -1
  4. data/lib/bosh/director/version.rb +1 -1
  5. data/lib/cloud/dummy.rb +4 -12
  6. metadata +24 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: eb1e33e934dc8fb2e942461ceea197e61995b852
4
- data.tar.gz: d915b1c4eaab7a3188817c9ffce3890c6931dd06
3
+ metadata.gz: 4a7f44d202087d4aa0089e08984847e842eb313d
4
+ data.tar.gz: 971df267af17197cb276d5085b29a5422383ca93
5
5
  SHA512:
6
- metadata.gz: b62223d97415c758a6e7cc405ed08e3b75d967e91f1291680ccd66be69f635f4043c7def087699dbe766f19d85bcf0619a8dc8f5ea10a4d58cdf7f7bf18032b4
7
- data.tar.gz: c7838d737a2fa59f1693822537c1646601ddb42eb10762c371a7eea5bed6720d46d6f84cb48e1a5118e52baeae140845996a968880a18c7142c63119dd2bfa41
6
+ metadata.gz: c078eaa4f69de3e9ff00e8de8e4a27fa95cc666a52fc9fa1474c642835798f2d90bf53cc0898c8de2a06a54b59d51471504032a91f1cdadb5ec5c520955341f7
7
+ data.tar.gz: 71537ae4313800620429ec5ac9eb8eae8ac4ea92b71ce29821ecc225052d63df19e9aaa1cf02742d08dcd7bd3075ebf260fec8bb17a1a878998c0ae959b2dcfe
data/db/migrations/director/20140731215410_increase_text_limit_for_data_columns.rb ADDED
@@ -0,0 +1,52 @@
1
+ require 'digest/sha1'
2
+
3
+ Sequel.migration do
4
+ change do
5
+ affected_constraint = [:package_id, :stemcell_id, :dependency_key]
6
+ constraint = self.indexes(:compiled_packages).find do |_, v|
7
+ v[:columns] == affected_constraint
8
+ end
9
+
10
+ if constraint
11
+ if [:mysql2, :mysql].include?(adapter_scheme)
12
+ alter_table(:compiled_packages) do
13
+ drop_index affected_constraint, name: constraint.first
14
+ end
15
+ else
16
+ alter_table(:compiled_packages) do
17
+ drop_constraint constraint.first
18
+ end
19
+ end
20
+ end
21
+
22
+ alter_table(:compiled_packages) do
23
+ set_column_type :dependency_key, String, null: false, text: true
24
+
25
+ add_column :dependency_key_sha1, String, null: true
26
+ end
27
+
28
+
29
+ self[:compiled_packages].each do |row|
30
+ self[:compiled_packages].filter(:id => row[:id]).update(
31
+ :dependency_key_sha1 => Digest::SHA1.hexdigest(row[:dependency_key])
32
+ )
33
+ end
34
+
35
+ # enforcing dependency_key_sha1 to be not null after adding values to old data
36
+ alter_table(:compiled_packages) do
37
+ set_column_not_null :dependency_key_sha1
38
+
39
+ # Dependency key is part of unique constraint since different
40
+ # dependencies uniquely identify compiled package
41
+ add_index [:package_id, :stemcell_id, :dependency_key_sha1], unique: true, name: 'package_stemcell_dependency_key_sha1_idx'
42
+ end
43
+
44
+ alter_table(:deployment_properties) do
45
+ set_column_type :value, String, null: false, text: true
46
+ end
47
+
48
+ alter_table(:director_attributes) do
49
+ set_column_type :value, String, text: true
50
+ end
51
+ end
52
+ end
data/lib/bosh/director/models/compiled_package.rb CHANGED
@@ -12,6 +12,12 @@ module Bosh::Director::Models
12
12
  validates_unique [:package_id, :stemcell_id, :build]
13
13
  end
14
14
 
15
+ def before_save
16
+ self.dependency_key_sha1 = Digest::SHA1.hexdigest(self.dependency_key)
17
+
18
+ super
19
+ end
20
+
15
21
  def name
16
22
  package.name
17
23
  end
@@ -28,6 +34,5 @@ module Bosh::Director::Models
28
34
 
29
35
  filter(attrs).max(:build).to_i + 1
30
36
  end
31
-
32
37
  end
33
38
  end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2671.0'
3
+ VERSION = '1.2681.0'
4
4
  end
5
5
  end
data/lib/cloud/dummy.rb CHANGED
@@ -18,11 +18,6 @@ module Bosh
18
18
  raise ArgumentError, 'Must specify dir'
19
19
  end
20
20
 
21
- @agent_type = options['agent']['type']
22
- unless %w(ruby go).include?(@agent_type)
23
- raise ArgumentError, 'Unknown agent type provided'
24
- end
25
-
26
21
  @running_vms_dir = File.join(@base_dir, 'running_vms')
27
22
 
28
23
  @logger = MonoLogger.new(options['log_device'] || STDOUT)
@@ -174,7 +169,7 @@ module Bosh
174
169
  root_dir = File.join(agent_base_dir(agent_id), 'root_dir')
175
170
  FileUtils.mkdir_p(File.join(root_dir, 'etc', 'logrotate.d'))
176
171
 
177
- agent_cmd = agent_cmd(agent_id, root_dir)
172
+ agent_cmd = agent_cmd(agent_id)
178
173
  agent_log = agent_log_path(agent_id)
179
174
 
180
175
  agent_pid = Process.spawn(*agent_cmd, {
@@ -215,12 +210,9 @@ module Bosh
215
210
  File.write(path, JSON.generate('ip' => ip_address))
216
211
  end
217
212
 
218
- def agent_cmd(agent_id, root_dir)
219
- go_agent_exe = File.expand_path('../../../../go_agent/out/bosh-agent', __FILE__)
220
- {
221
- 'ruby' => %W[bosh_agent -b #{agent_base_dir(agent_id)} -I dummy -r #{root_dir} --no-alerts],
222
- 'go' => %W[#{go_agent_exe} -b #{agent_base_dir(agent_id)} -I dummy -P dummy -M dummy-nats],
223
- }[@agent_type.to_s]
213
+ def agent_cmd(agent_id)
214
+ go_agent_exe = File.expand_path('../../../../go/src/github.com/cloudfoundry/bosh-agent/out/bosh-agent', __FILE__)
215
+ %W[#{go_agent_exe} -b #{agent_base_dir(agent_id)} -I dummy -P dummy -M dummy-nats]
224
216
  end
225
217
 
226
218
  def read_agent_settings(agent_id)
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.2671.0
4
+ version: 1.2681.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-31 00:00:00.000000000 Z
11
+ date: 2014-08-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt-ruby
@@ -30,140 +30,140 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2671.0
33
+ version: 1.2681.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.2671.0
40
+ version: 1.2681.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.2671.0
47
+ version: 1.2681.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.2671.0
54
+ version: 1.2681.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.2671.0
61
+ version: 1.2681.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.2671.0
68
+ version: 1.2681.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.2671.0
75
+ version: 1.2681.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.2671.0
82
+ version: 1.2681.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-template
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.2671.0
89
+ version: 1.2681.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.2671.0
96
+ version: 1.2681.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh_cpi
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.2671.0
103
+ version: 1.2681.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.2671.0
110
+ version: 1.2681.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.2671.0
117
+ version: 1.2681.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.2671.0
124
+ version: 1.2681.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: bosh_aws_cpi
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.2671.0
131
+ version: 1.2681.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.2671.0
138
+ version: 1.2681.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: bosh_vsphere_cpi
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 1.2671.0
145
+ version: 1.2681.0
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 1.2671.0
152
+ version: 1.2681.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_warden_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.2671.0
159
+ version: 1.2681.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.2671.0
166
+ version: 1.2681.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: bosh_vcloud_cpi
169
169
  requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
460
460
  version: '0'
461
461
  description: |-
462
462
  BOSH Director
463
- 03191d
463
+ c8f6a2
464
464
  email: support@cloudfoundry.com
465
465
  executables:
466
466
  - bosh-director
@@ -509,6 +509,7 @@ files:
509
509
  - db/migrations/director/20131125232201_rename_rendered_templates_archives_blob_id_and_checksum_columns.rb
510
510
  - db/migrations/director/20140116002324_pivot_director_attributes.rb
511
511
  - db/migrations/director/20140124225348_proper_pk_for_attributes.rb
512
+ - db/migrations/director/20140731215410_increase_text_limit_for_data_columns.rb
512
513
  - db/migrations/dns/20120123234908_initial.rb
513
514
  - lib/bosh/director.rb
514
515
  - lib/bosh/director/agent_client.rb