Facter 'osd_devices_list' sgdisk issue

Facter 'osd_devices_list' shouldn't return nil.

Change-Id: Iaf96c040a38f89052b062715ee3be2eaf3921235
(cherrypicked from commit 35fdff42f7)
Closes-Bug: #1537102
This commit is contained in:
Maksim Malchuk
2016-01-22 23:56:26 +03:00
parent 420c6fa5f8
commit 59621be94d
2 changed files with 1 additions and 11 deletions

View File

@@ -1,12 +1,4 @@
Facter.add("osd_devices_list") do
case Facter.value(:osfamily)
when /(?i)(redhat)/
sgdisk_exe = "/usr/sbin/sgdisk"
when /(?i)(debian)/
sgdisk_exe = "/sbin/sgdisk"
end
return unless File.exists?(sgdisk_exe)
setcode do
output = []
disks = {}

View File

@@ -1,3 +1,4 @@
#! /usr/bin/env ruby -S rspec
require 'spec_helper'
describe "ceph::facter::osd_devices_list", :type => :fact do
@@ -9,7 +10,6 @@ describe "ceph::facter::osd_devices_list", :type => :fact do
context "with typical block device names" do
context "OSD without journal"
before :all do
Facter.fact(:osfamily).stubs(:value).returns("redhat")
Facter::Util::Resolution.stubs(:exec).with(%q{lsblk -nr -o KNAME,TYPE}).returns(
"sda disk
sda1 part
@@ -64,7 +64,6 @@ Partition unique GUID: 4400F9A1-DE34-44EB-AE42-61578FFF31D5
context "OSD with journal" do
before :all do
Facter.fact(:osfamily).stubs(:value).returns("redhat")
Facter::Util::Resolution.stubs(:exec).with(%q{lsblk -nr -o KNAME,TYPE}).returns(
"sda disk
sda1 part
@@ -152,7 +151,6 @@ Partition unique GUID: 91DF4C37-DEC2-45D1-B977-DC73FD5AA195")
context "with special block device names" do
before :all do
Facter.fact(:osfamily).stubs(:value).returns("redhat")
Facter::Util::Resolution.stubs(:exec).with(%q{lsblk -nr -o KNAME,TYPE}).returns(
"cciss!c0d0 disk
cciss/c0d0p1 part