Remove the leftover of swift3 support
The support for swift3 has already been deprecated and removed[1], so
we can now remove the logic to ensure it's absent.
[1] d4ec1b631f
Change-Id: Icde495557fef0ba4862ba2e4e79463c254b17de6
This commit is contained in:
parent
a57d5fe28a
commit
023863af52
|
@ -212,12 +212,6 @@ class swift::proxy(
|
|||
warning('pipeline parameter must contain proxy-server')
|
||||
}
|
||||
|
||||
# TODO(tkajinam): Remove this when we remove swift::proxy::swift3
|
||||
if member($pipeline, 'swift3') {
|
||||
fail('swift3 is no longer supported by puppet-swift. Use s3api middleware \
|
||||
and swift::proxy::s3api instead')
|
||||
}
|
||||
|
||||
if($auth_type == 'tempauth' and ! $account_autocreate ){
|
||||
fail('account_autocreate must be set to true when auth_type is tempauth')
|
||||
}
|
||||
|
|
|
@ -259,17 +259,6 @@ describe 'swift::proxy' do
|
|||
end
|
||||
end
|
||||
|
||||
describe 'when unsupported swift3 is used' do
|
||||
let :params do
|
||||
{
|
||||
:pipeline => ['swift3', 'swauth', 'proxy-server']
|
||||
}
|
||||
end
|
||||
|
||||
it 'should fail if swift3 is included in pipeline' do
|
||||
should raise_error(Puppet::Error)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue