openstack/puppet-swift
Code Issues Proposed changes

Merge "Add keystone to swift-proxy, use dispersion-report"

Browse Source
This commit is contained in:
Jenkins 2016-05-25 02:14:47 +00:00 committed by Gerrit Code Review
commit 00193204a7
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/dispersion.pp
View File

@ -108,8 +108,8 @@ class swift::dispersion (
path => ['/bin', '/usr/bin'],
subscribe => File['/etc/swift/dispersion.conf'],
timeout => 0,
onlyif => "swift -A ${auth_url} -U ${auth_tenant}:${auth_user} -K ${auth_pass} -V ${auth_version} stat | grep 'Account: '",
unless => "swift -A ${auth_url} -U ${auth_tenant}:${auth_user} -K ${auth_pass} -V ${auth_version} list | grep dispersion_",
onlyif => "swift -A ${auth_url} --os-username ${auth_user} --os-project-name ${auth_tenant} --os-password ${auth_pass} -V ${auth_version} stat | grep 'Account: '",
unless => "swift -A ${auth_url} --os-username ${auth_user} --os-project-name ${auth_tenant} --os-password ${auth_pass} -V ${auth_version} list | grep dispersion_",
require => Package['swiftclient'],
}

23
spec/acceptance/basic_swift_spec.rb
View File

@ -33,6 +33,7 @@ describe 'basic swift' do
}
# create xfs partitions on a loopback device and mounts them
swift::storage::loopback { '2':
seek => '200000',
require => Class['swift'],
}
# sets up storage nodes which is composed of a single
@ -53,19 +54,20 @@ describe 'basic swift' do
}
class { '::swift::proxy':
proxy_local_net_ip => '127.0.0.1',
pipeline => ['healthcheck', 'cache', 'tempauth', 'dlo', 'proxy-server'],
pipeline => ['healthcheck', 'proxy-logging', 'cache', 'authtoken', 'keystone', 'dlo', 'proxy-server'],
account_autocreate => true,
require => Class['swift::ringbuilder'],
}
class { '::swift::proxy::authtoken':
admin_password => 'a_big_secret',
}
class { '::swift::keystone::dispersion': } -> class { '::swift::dispersion': }
class {'::swift::objectexpirer':
interval => 600,
}
class {
[ '::swift::proxy::healthcheck', '::swift::proxy::cache',
'::swift::proxy::tempauth', '::swift::proxy::dlo' ]:
[ '::swift::proxy::healthcheck', '::swift::proxy::proxy_logging', '::swift::proxy::cache',
'::swift::proxy::keystone', '::swift::proxy::dlo' ]:
}
EOS
@ -114,6 +116,7 @@ describe 'basic swift' do
}
# create xfs partitions on a loopback device and mounts them
swift::storage::loopback { '2':
seek => '200000',
require => Class['swift'],
}
# sets up storage nodes which is composed of a single
@ -127,13 +130,13 @@ describe 'basic swift' do
require => Swift::Storage::Loopback[2] ,
}
class { '::swift::storage::account':
service_provider => 'swiftinit',
service_provider => 'swiftinit',
}
class { '::swift::storage::container':
service_provider => 'swiftinit',
service_provider => 'swiftinit',
}
class { '::swift::storage::object':
service_provider => 'swiftinit',
service_provider => 'swiftinit',
}
class { '::swift::ringbuilder':
part_power => '18',
@ -143,7 +146,7 @@ describe 'basic swift' do
}
class { '::swift::proxy':
proxy_local_net_ip => '127.0.0.1',
pipeline => ['healthcheck', 'cache', 'tempauth', 'proxy-server'],
pipeline => ['healthcheck', 'proxy-logging', 'cache', 'authtoken', 'keystone', 'dlo', 'proxy-server'],
account_autocreate => true,
require => Class['swift::ringbuilder'],
service_provider => 'swiftinit',
@ -151,11 +154,15 @@ describe 'basic swift' do
class { '::swift::proxy::authtoken':
admin_password => 'a_big_secret',
}
class { '::swift::keystone::dispersion': } -> class { '::swift::dispersion': }
class {'::swift::objectexpirer':
interval => 600,
service_provider => 'swiftinit',
}
class { ['::swift::proxy::healthcheck', '::swift::proxy::cache', '::swift::proxy::tempauth']: }
class {
[ '::swift::proxy::healthcheck', '::swift::proxy::proxy_logging', '::swift::proxy::cache',
'::swift::proxy::keystone', '::swift::proxy::dlo' ]:
}
EOS
# Run one time to catch any errors upgrading to swiftinit service provider

4
spec/classes/swift_dispersion_spec.rb
View File

@ -65,8 +65,8 @@ describe 'swift::dispersion' do
is_expected.to contain_exec('swift-dispersion-populate').with(
:path => ['/bin', '/usr/bin'],
:subscribe => 'File[/etc/swift/dispersion.conf]',
:onlyif => "swift -A #{p[:auth_url]} -U #{p[:auth_tenant]}:#{p[:auth_user]} -K #{p[:auth_pass]} -V #{p[:auth_version]} stat | grep 'Account: '",
:unless => "swift -A #{p[:auth_url]} -U #{p[:auth_tenant]}:#{p[:auth_user]} -K #{p[:auth_pass]} -V #{p[:auth_version]} list | grep dispersion_",
:onlyif => "swift -A #{p[:auth_url]} --os-username #{p[:auth_user]} --os-project-name #{p[:auth_tenant]} --os-password #{p[:auth_pass]} -V #{p[:auth_version]} stat | grep 'Account: '",
:unless => "swift -A #{p[:auth_url]} --os-username #{p[:auth_user]} --os-project-name #{p[:auth_tenant]} --os-password #{p[:auth_pass]} -V #{p[:auth_version]} list | grep dispersion_",
:require => 'Package[swiftclient]'
)
end