Skip to content

Commit

Permalink
Remove swauth support
Browse files Browse the repository at this point in the history
It was deprecated during zed cycle[1], because swauth was already
retired at that time.

[1] 0eda2a0

Change-Id: I4567f6339f277c0cc2d0c3ee91671067af65a156
  • Loading branch information
kajinamit committed Jan 15, 2025
1 parent feec56d commit cd0dd76
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 89 deletions.
4 changes: 1 addition & 3 deletions manifests/proxy.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# [*pipeline*]
# (optional) The list of elements of the swift proxy pipeline.
# Currently supports healthcheck, cache, proxy-server, and
# one of the following auth_types: tempauth, swauth, keystone.
# one of the following auth_types: tempauth, keystone.
# Each of the specified elements also need to be declared externally
# as a puppet class with the exception of proxy-server.
# Defaults to ['catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging',
Expand Down Expand Up @@ -247,8 +247,6 @@
if(member($pipeline, 'tempauth')) {
$auth_type = 'tempauth'
} elsif(member($pipeline, 'swauth')) {
$auth_type = 'swauth'
} elsif(member($pipeline, 'keystone')) {
$auth_type = 'keystone'
} else {
Expand Down
40 changes: 0 additions & 40 deletions manifests/proxy/swauth.pp

This file was deleted.

4 changes: 4 additions & 0 deletions releasenotes/notes/remove-swauth-f2316eab90d0549b.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
upgrade:
- |
The ``swift::proxy::swauth`` class has been removed.
14 changes: 7 additions & 7 deletions spec/classes/swift_proxy_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ class { swift: swift_hash_path_suffix => string }
describe 'when more parameters are set' do
let :pre_condition do
"class { memcached: max_memory => 1}
class { swift: swift_hash_path_suffix => string }
include swift::proxy::swauth"
class { swift: swift_hash_path_suffix => string }"
end

let :params do
Expand All @@ -141,7 +140,7 @@ class { swift: swift_hash_path_suffix => string }
:cert_file => '/path/to/cert',
:key_file => '/path/to/key',
:workers => 3,
:pipeline => ['swauth', 'proxy-server'],
:pipeline => ['proxy-server'],
:allow_account_management => false,
:account_autocreate => false,
:log_level => 'DEBUG',
Expand Down Expand Up @@ -181,7 +180,7 @@ class { swift: swift_hash_path_suffix => string }
it { should contain_swift_proxy_config('DEFAULT/log_address').with_value('/dev/log') }
it { should contain_swift_proxy_config('DEFAULT/client_timeout').with_value('120') }
it { should contain_swift_proxy_config('DEFAULT/keepalive_timeout').with_value('121') }
it { should contain_swift_proxy_config('pipeline:main/pipeline').with_value('swauth proxy-server') }
it { should contain_swift_proxy_config('pipeline:main/pipeline').with_value('proxy-server') }
it { should contain_swift_proxy_config('app:proxy-server/use').with_value('egg:swift#proxy') }
it { should contain_swift_proxy_config('app:proxy-server/set log_name').with_value('swift-proxy-server') }
it { should contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL2') }
Expand Down Expand Up @@ -214,7 +213,7 @@ class { swift: swift_hash_path_suffix => string }
let :params do
{
:proxy_local_net_ip => '10.0.0.2',
:pipeline => ['swauth', 'proxy-server'],
:pipeline => ['tempauth', 'proxy-server'],
:log_level => 'DEBUG',
:log_name => 'swift-proxy-server',
:log_udp_host => '127.0.0.1',
Expand All @@ -226,7 +225,8 @@ class { swift: swift_hash_path_suffix => string }
let :pre_condition do
"class { memcached: max_memory => 1}
class { swift: swift_hash_path_suffix => string }
include swift::proxy::swauth"
include swift::proxy::tempauth
"
end

it { should contain_swift_proxy_config('DEFAULT/bind_ip').with_value('10.0.0.2') }
Expand All @@ -237,7 +237,7 @@ class { swift: swift_hash_path_suffix => string }
it { should contain_swift_proxy_config('DEFAULT/log_address').with_value('/dev/log') }
it { should contain_swift_proxy_config('DEFAULT/log_udp_host').with_value('127.0.0.1') }
it { should contain_swift_proxy_config('DEFAULT/log_udp_port').with_value('514') }
it { should contain_swift_proxy_config('pipeline:main/pipeline').with_value('swauth proxy-server') }
it { should contain_swift_proxy_config('pipeline:main/pipeline').with_value('tempauth proxy-server') }
it { should contain_swift_proxy_config('app:proxy-server/use').with_value('egg:swift#proxy') }
it { should contain_swift_proxy_config('app:proxy-server/set log_name').with_value('swift-proxy-server') }
it { should contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL2') }
Expand Down
39 changes: 0 additions & 39 deletions spec/classes/swift_proxy_swauth_spec.rb

This file was deleted.

0 comments on commit cd0dd76

Please sign in to comment.