
The 'swiftinit' provider is a custom provider of the service type that manages swift services using swift-init. Use of the swiftinit service provider is optional, the default is to use service providers specified in params file. This provider also manages swift services starting at boot by adding or removing a templated init or services file and making systemctl calls. See README for more detail. A wrapper defined type 'swift::service' has been created to simplify use of the swiftinit provider without adding logic to every class. this wrapper also aids in input validation and testing of the swiftinit provider. Two extra runs of apply_manifest have been added to the basic_swift_spec acceptance test. The service_provider is set to "swiftinit". The first run catches any errors upgrading to the swiftinit service provider and the second run tests idempotency. This patch is an initial step towards using swift-init to manage multiple swift services out of different configuration files such as is needed to run a separate replication network. Change-Id: I2f71c82c7a6c463f8c76a193409c0a17daa15bda
168 lines
5.4 KiB
Ruby
168 lines
5.4 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'swift::storage::all' do
|
|
# TODO I am not testing the upstart code b/c it should be temporary
|
|
|
|
let :facts do
|
|
{
|
|
:operatingsystem => 'Ubuntu',
|
|
:osfamily => 'Debian'
|
|
}
|
|
end
|
|
|
|
let :pre_condition do
|
|
"class { 'swift': swift_hash_suffix => 'changeme' }"
|
|
end
|
|
|
|
let :default_params do
|
|
{
|
|
:devices => '/srv/node',
|
|
:object_port => '6000',
|
|
:container_port => '6001',
|
|
:account_port => '6002',
|
|
:log_facility => 'LOG_LOCAL2',
|
|
:incoming_chmod => '0644',
|
|
:outgoing_chmod => '0644',
|
|
:log_requests => true
|
|
}
|
|
end
|
|
|
|
describe 'when an internal network ip is not specified' do
|
|
it_raises 'a Puppet::Error', /Must pass storage_local_net_ip/
|
|
end
|
|
|
|
[{ :storage_local_net_ip => '127.0.0.1' },
|
|
{
|
|
:devices => '/tmp/node',
|
|
:storage_local_net_ip => '10.0.0.1',
|
|
:object_port => '7000',
|
|
:container_port => '7001',
|
|
:account_port => '7002',
|
|
:object_pipeline => ["1", "2"],
|
|
:container_pipeline => ["3", "4"],
|
|
:account_pipeline => ["5", "6"],
|
|
:allow_versions => true,
|
|
:log_facility => ['LOG_LOCAL2', 'LOG_LOCAL3'],
|
|
:incoming_chmod => 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r',
|
|
:outgoing_chmod => 'Du=rwx,g=rx,o=rx,Fu=rw,g=r,o=r',
|
|
:log_requests => false
|
|
}
|
|
].each do |param_set|
|
|
|
|
describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
|
|
let :param_hash do
|
|
default_params.merge(param_set)
|
|
end
|
|
|
|
let :params do
|
|
param_set
|
|
end
|
|
|
|
['object', 'container', 'account'].each do |type|
|
|
it { is_expected.to contain_package("swift-#{type}").with_ensure('present') }
|
|
it { is_expected.to contain_service("swift-#{type}-server").with(
|
|
{:provider => 'upstart',
|
|
:ensure => 'running',
|
|
:enable => true,
|
|
:hasstatus => true
|
|
})}
|
|
it { is_expected.to contain_service("swift-#{type}-replicator").with(
|
|
{:provider => 'upstart',
|
|
:ensure => 'running',
|
|
:enable => true,
|
|
:hasstatus => true
|
|
}
|
|
)}
|
|
it { is_expected.to contain_file("/etc/swift/#{type}-server/").with(
|
|
{:ensure => 'directory'}
|
|
)}
|
|
end
|
|
|
|
let :storage_server_defaults do
|
|
{:devices => param_hash[:devices],
|
|
:storage_local_net_ip => param_hash[:storage_local_net_ip],
|
|
:incoming_chmod => param_hash[:incoming_chmod],
|
|
:outgoing_chmod => param_hash[:outgoing_chmod],
|
|
:log_facility => param_hash[:log_facility]
|
|
}
|
|
end
|
|
|
|
it { is_expected.to contain_swift__storage__server(param_hash[:account_port]).with(
|
|
{:type => 'account',
|
|
:config_file_path => 'account-server.conf',
|
|
:incoming_chmod => param_hash[:incoming_chmod],
|
|
:outgoing_chmod => param_hash[:outgoing_chmod],
|
|
:pipeline => param_hash[:account_pipeline] || ['account-server'] }.merge(storage_server_defaults)
|
|
)}
|
|
it { is_expected.to contain_swift__storage__server(param_hash[:object_port]).with(
|
|
{:type => 'object',
|
|
:config_file_path => 'object-server.conf',
|
|
:incoming_chmod => param_hash[:incoming_chmod],
|
|
:outgoing_chmod => param_hash[:outgoing_chmod],
|
|
:pipeline => param_hash[:object_pipeline] || ['object-server'] }.merge(storage_server_defaults)
|
|
)}
|
|
it { is_expected.to contain_swift__storage__server(param_hash[:container_port]).with(
|
|
{:type => 'container',
|
|
:config_file_path => 'container-server.conf',
|
|
:incoming_chmod => param_hash[:incoming_chmod],
|
|
:outgoing_chmod => param_hash[:outgoing_chmod],
|
|
:pipeline => param_hash[:container_pipeline] || ['container-server'],
|
|
:allow_versions => param_hash[:allow_versions] || false }.merge(storage_server_defaults)
|
|
)}
|
|
|
|
it { is_expected.to contain_class('rsync::server').with(
|
|
{:use_xinetd => true,
|
|
:address => param_hash[:storage_local_net_ip],
|
|
:use_chroot => 'no'
|
|
}
|
|
)}
|
|
|
|
end
|
|
end
|
|
|
|
describe "when installed on Debian" do
|
|
let :facts do
|
|
{
|
|
:operatingsystem => 'Debian',
|
|
:osfamily => 'Debian'
|
|
}
|
|
end
|
|
|
|
[{ :storage_local_net_ip => '127.0.0.1' },
|
|
{
|
|
:devices => '/tmp/node',
|
|
:storage_local_net_ip => '10.0.0.1',
|
|
:object_port => '7000',
|
|
:container_port => '7001',
|
|
:account_port => '7002'
|
|
}
|
|
].each do |param_set|
|
|
describe "when #{param_set == {} ? "using default" : "specifying"} class parameters" do
|
|
let :param_hash do
|
|
default_params.merge(param_set)
|
|
end
|
|
|
|
let :params do
|
|
param_set
|
|
end
|
|
['object', 'container', 'account'].each do |type|
|
|
it { is_expected.to contain_package("swift-#{type}").with_ensure('present') }
|
|
it { is_expected.to contain_service("swift-#{type}-server").with(
|
|
{:provider => nil,
|
|
:ensure => 'running',
|
|
:enable => true,
|
|
:hasstatus => true
|
|
})}
|
|
it { is_expected.to contain_service("swift-#{type}-replicator").with(
|
|
{:provider => nil,
|
|
:ensure => 'running',
|
|
:enable => true,
|
|
:hasstatus => true
|
|
}
|
|
)}
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|