openstack/puppet-swift
Code Issues Proposed changes

Add fundamental middlewares to proxy-server pipeline

Browse Source 
This change makes sure the fundamental middlewares like gatekeeper are
tested in acceptance tests.

Change-Id: I9d911b8876ecb393b1b275fbd450eff63dad4c04
This commit is contained in:
Takashi Kajinami
2022-08-22 15:15:53 +09:00
parent 839ccc7f20
commit eb15c310d6
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spec/acceptance/10_basic_swift_spec.rb
View File

@@ -94,19 +94,30 @@ describe 'basic swift' do
} }
class { 'swift::proxy': class { 'swift::proxy':
proxy_local_net_ip => '127.0.0.1', proxy_local_net_ip => '127.0.0.1',
pipeline => ['healthcheck', 'proxy-logging', 'cache', 'authtoken', 'keystone', 'dlo', 'proxy-server'], pipeline => [
'catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging',
'cache', 'authtoken', 'keystone', 'symlink', 'proxy-logging',
'proxy-server'
],
account_autocreate => true, account_autocreate => true,
} }
class { 'swift::proxy::authtoken': class { 'swift::proxy::authtoken':
password => 'a_big_secret', password => 'a_big_secret',
} }
class { 'swift::keystone::dispersion': } -> class { 'swift::dispersion': } class { 'swift::keystone::dispersion': } -> class { 'swift::dispersion': }
class {'::swift::objectexpirer': class { 'swift::objectexpirer':
interval => 600, interval => 600,
} }
class { class {
[ '::swift::proxy::healthcheck', '::swift::proxy::proxy_logging', '::swift::proxy::cache', [
'::swift::proxy::keystone', '::swift::proxy::dlo' ]: 'swift::proxy::catch_errors',
'swift::proxy::gatekeeper',
'swift::proxy::healthcheck',
'swift::proxy::proxy_logging',
'swift::proxy::cache',
'swift::proxy::keystone',
'swift::proxy::symlink'
]:
} }
EOS EOS
@@ -224,7 +235,11 @@ describe 'basic swift' do
} }
class { 'swift::proxy': class { 'swift::proxy':
proxy_local_net_ip => '127.0.0.1', proxy_local_net_ip => '127.0.0.1',
pipeline => ['healthcheck', 'proxy-logging', 'cache', 'authtoken', 'keystone', 'dlo', 'proxy-server'], pipeline => [
'catch_errors', 'gatekeeper', 'healthcheck', 'proxy-logging',
'cache', 'authtoken', 'keystone', 'symlink', 'proxy-logging',
'proxy-server'
],
account_autocreate => true, account_autocreate => true,
service_provider => 'swiftinit', service_provider => 'swiftinit',
} }
@@ -232,13 +247,20 @@ describe 'basic swift' do
password => 'a_big_secret', password => 'a_big_secret',
} }
class { 'swift::keystone::dispersion': } -> class { 'swift::dispersion': } class { 'swift::keystone::dispersion': } -> class { 'swift::dispersion': }
class {'::swift::objectexpirer': class { 'swift::objectexpirer':
interval => 600, interval => 600,
service_provider => 'swiftinit', service_provider => 'swiftinit',
} }
class { class {
[ '::swift::proxy::healthcheck', '::swift::proxy::proxy_logging', '::swift::proxy::cache', [
'::swift::proxy::keystone', '::swift::proxy::dlo' ]: 'swift::proxy::catch_errors',
'swift::proxy::gatekeeper',
'swift::proxy::healthcheck',
'swift::proxy::proxy_logging',
'swift::proxy::cache',
'swift::proxy::keystone',
'swift::proxy::symlink'
]:
} }
EOS EOS