openstack/puppet-swift
Code Issues Proposed changes

Merge "Swift-ring-builder skip line 'Ring up-to-date..'"

Browse Source
This commit is contained in:
Jenkins
2016-05-20 17:11:37 +00:00
committed by Gerrit Code Review
parent f626aea65d 5323bf83ac
commit 916943d5bb
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/puppet/provider/swift_ring_builder.rb
View File

@@ -22,6 +22,10 @@ class Puppet::Provider::SwiftRingBuilder < Puppet::Provider
if File.exists?(builder_file_path) if File.exists?(builder_file_path)
# Swift < 2.2.2 Skip first 4 info lines from swift-ring-builder output # Swift < 2.2.2 Skip first 4 info lines from swift-ring-builder output
if rows = swift_ring_builder(builder_file_path).split("\n")[4..-1] if rows = swift_ring_builder(builder_file_path).split("\n")[4..-1]
# Skip "Ring file ... is up-to-date" message, if printed.
if !rows[0].nil? and rows[0] =~ /Ring file\b.*\bis up-to-date/
rows.shift
end
# Swift 2.2.2+ Skip additional line to account for Overload info # Swift 2.2.2+ Skip additional line to account for Overload info
if !rows[0].nil? and rows[0].start_with?('Devices:') if !rows[0].nil? and rows[0].start_with?('Devices:')
rows.shift rows.shift