bosh-director 1.2982.0 → 1.2983.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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/director/agent_client.rb +12 -0
  3. data/lib/bosh/director/cloudcheck_helper.rb +1 -0
  4. data/lib/bosh/director/config.rb +3 -0
  5. data/lib/bosh/director/deployment_plan/steps/package_compile_step.rb +1 -0
  6. data/lib/bosh/director/instance_updater/vm_updater.rb +1 -0
  7. data/lib/bosh/director/resource_pool_updater.rb +1 -0
  8. data/lib/bosh/director/version.rb +1 -1
  9. data/lib/cloud/dummy.rb +1 -0
  10. metadata +21 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 892e2311d785c31556d345ef7b357e33622c3839
4
- data.tar.gz: d19586ffdd75357372e9c2e4c19c7306ba4af7ab
3
+ metadata.gz: 8b7e4b8adf7ea682264ed02adca7f9282deca12e
4
+ data.tar.gz: 093a660e497f520b1d4ffadf4c9fef11b5920442
5
5
  SHA512:
6
- metadata.gz: 14a7754ad732b7582e7b3afa5a64696c41d5fe25102a91822424387e8006030babd79bda632ca91c4e3293178df854a31fe9dac1289f7ae3791f1241ceabfdfe
7
- data.tar.gz: 5dd6f558ef78e596fa32d9d9841ff8ccf60e96fb43f68b79cbf07aa58e428b96bb67f1fdc92214ea58d4608bcadcb0303cde4a19eb39decb07bd84ce69e683d9
6
+ metadata.gz: d059f4aff7b94db5f12c341efab6351b04d1f412ef3bff12f21db4ee9713be125cdb65125a1323591e33ac044cfea117b50586e04ae1ba830f0c006cbc2c15c9
7
+ data.tar.gz: c3866c77b9b1eca791f8aa9774f82d4c92bd0424de30093384bc5027cb7caffa4d830eb045d8c985c48c0217076a961593173c1ef72f29266259c664622ac2cf
data/lib/bosh/director/agent_client.rb CHANGED
@@ -94,6 +94,18 @@ module Bosh::Director
94
94
  send_long_running_message(:unmount_disk, *args)
95
95
  end
96
96
 
97
+ def update_settings(certs)
98
+ begin
99
+ send_long_running_message(:update_settings, {"trusted_certs" => certs})
100
+ rescue RpcRemoteException => e
101
+ if e.message =~ /unknown message/
102
+ @logger.warn("Ignoring update_settings 'unknown message' error from the agent: #{e.inspect}")
103
+ else
104
+ raise
105
+ end
106
+ end
107
+ end
108
+
97
109
  def stop(*args)
98
110
  send_long_running_message(:stop, *args)
99
111
  end
data/lib/bosh/director/cloudcheck_helper.rb CHANGED
@@ -130,6 +130,7 @@ module Bosh::Director
130
130
  end
131
131
 
132
132
  agent_client(new_vm).wait_until_ready
133
+ agent_client(new_vm).update_settings(Bosh::Director::Config.trusted_certs)
133
134
 
134
135
  # After this point agent is actually responding to
135
136
  # pings, so if the rest of this handler fails
data/lib/bosh/director/config.rb CHANGED
@@ -26,6 +26,7 @@ module Bosh::Director
26
26
  :result,
27
27
  :revision,
28
28
  :task_checkpoint_interval,
29
+ :trusted_certs,
29
30
  :uuid,
30
31
  :current_job,
31
32
  :encryption,
@@ -139,6 +140,8 @@ module Bosh::Director
139
140
  .fetch('auto_fix_stateful_nodes', false)
140
141
  @enable_snapshots = config.fetch('snapshots', {}).fetch('enabled', false)
141
142
 
143
+ @trusted_certs = config['trusted_certs'] || ''
144
+
142
145
  Bosh::Clouds::Config.configure(self)
143
146
 
144
147
  @lock = Monitor.new
data/lib/bosh/director/deployment_plan/steps/package_compile_step.rb CHANGED
@@ -159,6 +159,7 @@ module Bosh::Director
159
159
  begin
160
160
  agent = AgentClient.with_defaults(vm.agent_id)
161
161
  agent.wait_until_ready
162
+ agent.update_settings(Bosh::Director::Config.trusted_certs)
162
163
 
163
164
  configure_vm(vm, agent, network_settings)
164
165
  vm_data.agent = agent
data/lib/bosh/director/instance_updater/vm_updater.rb CHANGED
@@ -93,6 +93,7 @@ module Bosh::Director
93
93
 
94
94
  agent_client = AgentClient.with_defaults(vm_model.agent_id)
95
95
  agent_client.wait_until_ready
96
+ agent_client.update_settings(Bosh::Director::Config.trusted_certs)
96
97
  rescue Exception => e
97
98
  @logger.error("Failed to create/contact VM #{vm_model.cid}: #{e.inspect}")
98
99
  VmDeleter.new(@instance, vm_model, @cloud, @logger).delete
data/lib/bosh/director/resource_pool_updater.rb CHANGED
@@ -53,6 +53,7 @@ module Bosh::Director
53
53
 
54
54
  agent = AgentClient.with_defaults(vm_model.agent_id)
55
55
  agent.wait_until_ready
56
+ agent.update_settings(Config.trusted_certs)
56
57
 
57
58
  update_state(agent, vm_model, vm)
58
59
 
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2982.0'
3
+ VERSION = '1.2983.0'
4
4
  end
5
5
  end
data/lib/cloud/dummy.rb CHANGED
@@ -60,6 +60,7 @@ module Bosh
60
60
  disks: { persistent: {} },
61
61
  networks: networks,
62
62
  vm: { name: "vm-#{agent_id}" },
63
+ cert: '',
63
64
  mbus: @options['nats'],
64
65
  })
65
66
 
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.2982.0
4
+ version: 1.2983.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-10 00:00:00.000000000 Z
11
+ date: 2015-06-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2982.0
33
+ version: 1.2983.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.2982.0
40
+ version: 1.2983.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.2982.0
47
+ version: 1.2983.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.2982.0
54
+ version: 1.2983.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.2982.0
61
+ version: 1.2983.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.2982.0
68
+ version: 1.2983.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.2982.0
75
+ version: 1.2983.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.2982.0
82
+ version: 1.2983.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.2982.0
89
+ version: 1.2983.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.2982.0
96
+ version: 1.2983.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.2982.0
103
+ version: 1.2983.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.2982.0
110
+ version: 1.2983.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.2982.0
117
+ version: 1.2983.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.2982.0
124
+ version: 1.2983.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.2982.0
131
+ version: 1.2983.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.2982.0
138
+ version: 1.2983.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.2982.0
145
+ version: 1.2983.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.2982.0
152
+ version: 1.2983.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_vcloud_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
572
572
  version: '0'
573
573
  description: |-
574
574
  BOSH Director
575
- 30e5c6
575
+ 71d152
576
576
  email: support@cloudfoundry.com
577
577
  executables:
578
578
  - bosh-director