openstack/puppet-swift
Code Issues Proposed changes

Add keystone to swift-proxy, use dispersion-report

Browse Source 
The existing acceptence test configures keystone on the swift node
but does not configure the swift service to use keystone.  This change
adds the neccesary middleware to the proxy node to actually use keystone.
Further proof of keystone working is acheived by enabling the
swift-dispersion-report class which uploads test objects to swift
after first authenticating with keystone.  This change also updates the
call to keystone used by the dispersion class to an updated format.

Change-Id: Ibf97762f9b19c0ccb72178b04a1a86028bab8bcf
This commit is contained in:
Adam Vinsh
2016-05-20 17:45:22 -04:00
committed by Adam Vinsh
parent 916943d5bb
commit 056e2579bd
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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