Skip to content

Commit fab7aed

Browse files
Sergei Iudinfacebook-github-bot
authored andcommitted
T22 initial provisioning
Differential Revision: D64848754 fbshipit-source-id: 66b93ecbec6bac2eaee82bc901c1fcab08b96176
1 parent 9e169b0 commit fab7aed

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

cookbooks/fb_storage/attributes/default.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,6 @@
4949
],
5050
'_clowntown_device_order_method' => nil,
5151
'_clowntown_override_file_method' => nil,
52+
'_skip_persistency' => [],
53+
'_skip_extra_devices' => [],
5254
}

cookbooks/fb_storage/libraries/storage.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,12 @@ def self.eligible_devices(node)
182182
# Legacy. We should probably fail hard here
183183
return [] if devices_to_skip.length.zero?
184184

185+
non_eligle = ['ram', 'loop', 'dm-', 'sr', 'md']
186+
if node&.dig('fb_storage', '_skip_extra_devices')
187+
non_eligle += node['fb_storage']['_skip_extra_devices']
188+
end
185189
node['block_device'].to_hash.reject do |x, _y|
186-
['ram', 'loop', 'dm-', 'sr', 'md'].include?(x.delete('0-9')) ||
190+
non_eligle.include?(x.delete('0-9')) ||
187191
devices_to_skip.include?(x)
188192
end.keys
189193
end
@@ -494,6 +498,10 @@ def self.gen_persistent_disk_data(disks)
494498
Dir.open(DEV_ID_DIR).each do |entry|
495499
next if %w{. ..}.include?(entry)
496500

501+
if ::Chef.node&.dig('fb_storage', '_skip_persistency')
502+
next if ::Chef.node['fb_storage']['_skip_persistency'].any? { |element| entry.include?(element) }
503+
end
504+
497505
p = "#{DEV_ID_DIR}/#{entry}"
498506
id_map[File.basename(File.readlink(p))] = entry
499507
end

0 commit comments

Comments
 (0)