bosh-director 1.2915.0 → 1.2922.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/lib/bosh/director/api/cloud_config_manager.rb +1 -1
  3. data/lib/bosh/director/api/controllers/deployments_controller.rb +25 -11
  4. data/lib/bosh/director/dns_helper.rb +13 -0
  5. data/lib/bosh/director/instance_updater.rb +1 -0
  6. data/lib/bosh/director/version.rb +1 -1
  7. metadata +21 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2707ebb2544ad4d8baf7c9db6fc3d0898c9f34f5
4
- data.tar.gz: 0693702bcac970f90a94bf9b5930f956bc14c339
3
+ metadata.gz: 23c5a59ec6394dce04d0486bf1ebaa9b193d9d26
4
+ data.tar.gz: 4b8a5c8bb0fb9327a0afa3c89f6428ce2d8bfb66
5
5
  SHA512:
6
- metadata.gz: 037437f2a42d47c8ddc99623e48e952f649dab2dd2e114c9e57c999e73b67098d52bc2ee1f0bc0ae56598240b6eb3e01a29bc838e3ede330504c0e57f0258f55
7
- data.tar.gz: 8f5d470c563313bc2e8808800d83dd2de013a3e7c9f29b68d9ddf34515c49566892b191183f6d079bc4d2ca2a825204b6b3f5c7a9b0b5e80e95f39dc7f6d0d02
6
+ metadata.gz: 250c65210e505c82a24f760e267c5519ef236277245b9e34932deb35c1b017692f7a91e099a7a685c1bcb1c48a03027153a4516a8d117e6bc0c49b5e05efe7ec
7
+ data.tar.gz: 8235012d25b528b8e7cc0eedf43889d842edc87da4491e52e6071dde4835561e5f246349e66691fa7b8983a827ac1c6afc19d190d2e321d630b4aa01bcb663f3
data/lib/bosh/director/api/cloud_config_manager.rb CHANGED
@@ -10,7 +10,7 @@ module Bosh
10
10
  end
11
11
 
12
12
  def list(limit)
13
- Bosh::Director::Models::CloudConfig.order(Sequel.desc(:created_at)).limit(limit).to_a
13
+ Bosh::Director::Models::CloudConfig.order(Sequel.desc(:id)).limit(limit).to_a
14
14
  end
15
15
 
16
16
  def latest
data/lib/bosh/director/api/controllers/deployments_controller.rb CHANGED
@@ -138,19 +138,33 @@ module Bosh::Director
138
138
  end
139
139
 
140
140
  get '/' do
141
- deployments = Models::Deployment.order_by(:name.asc).map { |deployment|
142
- name = deployment.name
141
+ latest_cloud_config = Api::CloudConfigManager.new.latest
142
+ deployments = Models::Deployment.order_by(:name.asc).map do |deployment|
143
+ cloud_config = if deployment.cloud_config.nil?
144
+ 'none'
145
+ elsif deployment.cloud_config == latest_cloud_config
146
+ 'latest'
147
+ else
148
+ 'outdated'
149
+ end
143
150
 
144
- releases = deployment.release_versions.map { |rv|
145
- Hash['name', rv.release.name, 'version', rv.version.to_s]
146
- }
147
-
148
- stemcells = deployment.stemcells.map { |sc|
149
- Hash['name', sc.name, 'version', sc.version]
151
+ {
152
+ 'name' => deployment.name,
153
+ 'releases' => deployment.release_versions.map do |rv|
154
+ {
155
+ 'name' => rv.release.name,
156
+ 'version' => rv.version.to_s
157
+ }
158
+ end,
159
+ 'stemcells' => deployment.stemcells.map do |sc|
160
+ {
161
+ 'name' => sc.name,
162
+ 'version' => sc.version
163
+ }
164
+ end,
165
+ 'cloud_config' => cloud_config
150
166
  }
151
-
152
- Hash['name', name, 'releases', releases, 'stemcells', stemcells]
153
- }
167
+ end
154
168
 
155
169
  json_encode(deployments)
156
170
  end
data/lib/bosh/director/dns_helper.rb CHANGED
@@ -200,6 +200,19 @@ module Bosh::Director
200
200
  "Invalid DNS for network `#{network}': #{reason}"
201
201
  end
202
202
 
203
+ # Purge cached DNS records
204
+ def flush_dns_cache
205
+ flush_command = Config.dns['flush_command']
206
+ if flush_command && !flush_command.empty?
207
+ stdout, stderr, status = Open3.capture3(flush_command)
208
+ if status == 0
209
+ @logger.debug("Flushed #{stdout.chomp} records from DNS cache")
210
+ else
211
+ @logger.warn("Failed to flush DNS cache: #{stderr.chomp}")
212
+ end
213
+ end
214
+ end
215
+
203
216
  private
204
217
 
205
218
  def reverse(ip, n)
data/lib/bosh/director/instance_updater.rb CHANGED
@@ -212,6 +212,7 @@ module Bosh::Director
212
212
  update_dns_a_record(domain, record_name, ip_address)
213
213
  update_dns_ptr_record(record_name, ip_address)
214
214
  end
215
+ flush_dns_cache
215
216
  end
216
217
 
217
218
  def recreate_vm(new_disk_cid)
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2915.0'
3
+ VERSION = '1.2922.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.2915.0
4
+ version: 1.2922.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-04-07 00:00:00.000000000 Z
11
+ date: 2015-04-10 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.2915.0
33
+ version: 1.2922.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.2915.0
40
+ version: 1.2922.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.2915.0
47
+ version: 1.2922.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.2915.0
54
+ version: 1.2922.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.2915.0
61
+ version: 1.2922.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.2915.0
68
+ version: 1.2922.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.2915.0
75
+ version: 1.2922.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.2915.0
82
+ version: 1.2922.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.2915.0
89
+ version: 1.2922.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.2915.0
96
+ version: 1.2922.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.2915.0
103
+ version: 1.2922.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.2915.0
110
+ version: 1.2922.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.2915.0
117
+ version: 1.2922.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.2915.0
124
+ version: 1.2922.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.2915.0
131
+ version: 1.2922.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.2915.0
138
+ version: 1.2922.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.2915.0
145
+ version: 1.2922.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.2915.0
152
+ version: 1.2922.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_vcloud_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -558,7 +558,7 @@ dependencies:
558
558
  version: '0'
559
559
  description: |-
560
560
  BOSH Director
561
- 5653ce
561
+ 3778c5
562
562
  email: support@cloudfoundry.com
563
563
  executables:
564
564
  - bosh-director