b379804ca9
The device set for the storage mount point was hard-coded to /dev/$name. This value is only valid when no device is supplied to the storage xfs setup. This commit updates it to use the target_device which is either the device that was passed, or /dev/$name if not device is specified.
52 lines
1.3 KiB
Ruby
52 lines
1.3 KiB
Ruby
require 'spec_helper'
|
|
describe 'swift::storage::xfs' do
|
|
let :title do
|
|
'foo'
|
|
end
|
|
|
|
describe 'when a device is specified' do
|
|
let :default_params do
|
|
{
|
|
:device => "/dev/#{title}",
|
|
:byte_size => '1024',
|
|
:mnt_base_dir => '/srv/node',
|
|
:loopback => false
|
|
}
|
|
end
|
|
|
|
[{},
|
|
{
|
|
:device => 'some_device',
|
|
:byte_size => 1,
|
|
:mnt_base_dir => '/mnt/foo',
|
|
:loopback => true
|
|
}
|
|
].each do |param_set|
|
|
|
|
describe "#{param_set == {} ? "using default" : "specifying"} class parameters" do
|
|
let :param_hash do
|
|
default_params.merge(param_set)
|
|
end
|
|
|
|
let :params do
|
|
param_set
|
|
end
|
|
|
|
it { should contain_exec("mkfs-foo").with(
|
|
:command => "mkfs.xfs -f -i size=#{param_hash[:byte_size]} #{param_hash[:device]}",
|
|
:path => ['/sbin/', '/usr/sbin/'],
|
|
:require => 'Package[xfsprogs]'
|
|
)}
|
|
|
|
it { should contain_swift__storage__mount(title).with(
|
|
:device => param_hash[:device],
|
|
:mnt_base_dir => param_hash[:mnt_base_dir],
|
|
:loopback => param_hash[:loopback],
|
|
:subscribe => 'Exec[mkfs-foo]'
|
|
)}
|
|
|
|
end
|
|
end
|
|
end
|
|
end
|