bosh-director 1.3184.0 → 1.3184.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/db/migrations/director/20160121003800_drop_vms_fkeys.rb +12 -0
  3. data/lib/bosh/director/deployment_plan/instance.rb +2 -2
  4. data/lib/bosh/director/models/instance.rb +0 -4
  5. data/lib/bosh/director/version.rb +1 -1
  6. data/lib/bosh/director/vm_creator.rb +1 -1
  7. metadata +17 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 719ce6818a14e485a79f386704b91114eb34ec24
4
- data.tar.gz: 4df2b7d2e44f80d07fce299c7193e024ece0dbb4
3
+ metadata.gz: f5c4413721bdb4e215a926c4cc6b111cc28baa54
4
+ data.tar.gz: a0dba6c7573e8940d25a659c269640e26620350f
5
5
  SHA512:
6
- metadata.gz: 333c8b937c107c990d73a30cc0574c83390a65dca6f82febe8cda5d3bbf7592d97fca65e2e5db60fea033ebd69d7da81002d034b0d45245c68ef3c7276ffd238
7
- data.tar.gz: 92a0385d1b148767af5daf1632b67a46c9acd14ee0a7974a6938216dbebdf707f6651ca4ea0410d1fde61dbbc77d5410773ccdec35bc719a0d501f4fad4075f1
6
+ metadata.gz: 7e942343443a03e57391ce7771b20fbe9b3a3973c692598908fa97382ad8ca950ba5eb658caab0de43df5aa3f921cc414d96f312ea002a8b7ed67045cc13c22b
7
+ data.tar.gz: c8de0e3d71c3f7272cec52fb4bf9a3d34ab3619977eaa790a5cc31f7eb06b50fae11dbbb5013e21459d52a5a899e5610ed116a179f21a6b363569fd0a115a377
data/db/migrations/director/20160121003800_drop_vms_fkeys.rb ADDED
@@ -0,0 +1,12 @@
1
+ Sequel.migration do
2
+ change do
3
+
4
+ # newer versions of sequel support drop_foreign_key but the version breaks tests
5
+ if [:mysql2, :mysql].include?(adapter_scheme)
6
+ run('alter table vms drop FOREIGN KEY vms_ibfk_1')
7
+ elsif [:postgres].include?(adapter_scheme)
8
+ run('alter table vms drop constraint vms_deployment_id_fkey')
9
+ end
10
+
11
+ end
12
+ end
data/lib/bosh/director/deployment_plan/instance.rb CHANGED
@@ -161,7 +161,7 @@ module Bosh::Director
161
161
  agent_partial_state = spec.as_apply_spec.select { |k, _| agent_spec_keys.include?(k) }
162
162
  agent_client.apply(agent_partial_state)
163
163
 
164
- instance_spec_keys = agent_spec_keys + ['stemcell', 'vm_type']
164
+ instance_spec_keys = agent_spec_keys + ['stemcell', 'vm_type', 'env']
165
165
  instance_partial_state = spec.full_spec.select { |k, _| instance_spec_keys.include?(k) }
166
166
  @current_state.merge!(instance_partial_state)
167
167
 
@@ -182,7 +182,7 @@ module Bosh::Director
182
182
  end
183
183
 
184
184
  def agent_client
185
- @agent_client ||= AgentClient.with_vm_credentials_and_agent_id(@model.credentials, @model.agent_id)
185
+ AgentClient.with_vm_credentials_and_agent_id(@model.credentials, @model.agent_id)
186
186
  end
187
187
 
188
188
  ##
data/lib/bosh/director/models/instance.rb CHANGED
@@ -99,10 +99,6 @@ module Bosh::Director::Models
99
99
  spec['env'] || {}
100
100
  end
101
101
 
102
- def vm_env=(vm_env_hash)
103
- self.spec = (spec || {}).merge(env: vm_env_hash)
104
- end
105
-
106
102
  def credentials
107
103
  return nil if credentials_json.nil?
108
104
  Yajl::Parser.parse(credentials_json)
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.3184.0'
3
+ VERSION = '1.3184.1.0'
4
4
  end
5
5
  end
data/lib/bosh/director/vm_creator.rb CHANGED
@@ -96,7 +96,7 @@ module Bosh::Director
96
96
  def create(instance_model, stemcell, cloud_properties, network_settings, disks, env)
97
97
  agent_id = self.class.generate_agent_id
98
98
  env = Bosh::Common::DeepCopy.copy(env)
99
- options = {:agent_id => agent_id, :vm_env => env }
99
+ options = { :agent_id => agent_id }
100
100
 
101
101
  if Config.encryption?
102
102
  credentials = generate_agent_credentials
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.3184.0
4
+ version: 1.3184.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-20 00:00:00.000000000 Z
11
+ date: 2016-01-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.3184.0
19
+ version: 1.3184.1.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.3184.0
26
+ version: 1.3184.1.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh_cpi
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3184.0
33
+ version: 1.3184.1.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.3184.0
40
+ version: 1.3184.1.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-registry
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.3184.0
47
+ version: 1.3184.1.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.3184.0
54
+ version: 1.3184.1.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: blobstore_client
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.3184.0
61
+ version: 1.3184.1.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.3184.0
68
+ version: 1.3184.1.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh-core
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.3184.0
75
+ version: 1.3184.1.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.3184.0
82
+ version: 1.3184.1.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-director-core
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.3184.0
89
+ version: 1.3184.1.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.3184.0
96
+ version: 1.3184.1.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh-template
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.3184.0
103
+ version: 1.3184.1.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.3184.0
110
+ version: 1.3184.1.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -657,6 +657,7 @@ files:
657
657
  - db/migrations/director/20151109190602_rename_orphan_columns.rb
658
658
  - db/migrations/director/20151229184742_add_vm_attributes_to_instance.rb
659
659
  - db/migrations/director/20160108191637_drop_vm_env_json_from_instance.rb
660
+ - db/migrations/director/20160121003800_drop_vms_fkeys.rb
660
661
  - db/migrations/dns/20120123234908_initial.rb
661
662
  - lib/bosh/director.rb
662
663
  - lib/bosh/director/agent_client.rb