openstack/puppet-swift
Code Issues Proposed changes

dispersion: add endpoint_type parameter

Browse Source 
This parameter is needed to perform a clean object dispersion.

Change-Id: I1c17f49b22fd2b30c022d27a2bc20ce0bd150240
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-01-27 22:20:45 +01:00
parent a5b5e1211f
commit 6aa573e49a
2 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/dispersion.pp
View File

@@ -27,6 +27,9 @@
# String. The version to pass to the 'swift' command. # String. The version to pass to the 'swift' command.
# Use '2.0' when using Keystone. # Use '2.0' when using Keystone.
# Optional. Defaults to '2.0' # Optional. Defaults to '2.0'
# [*endpoint_type*]
# String. The ability to choose which Swift endpoint to use.
# Optional. Defaults to 'publicURL'.
# [*swift_dir*] # [*swift_dir*]
# String. The path to swift configuration folder # String. The path to swift configuration folder
# Optional. Defaults to '/etc/swift'. # Optional. Defaults to '/etc/swift'.
@@ -60,6 +63,7 @@ class swift::dispersion (
$auth_tenant = 'services', $auth_tenant = 'services',
$auth_pass = 'dispersion_password', $auth_pass = 'dispersion_password',
$auth_version = '2.0', $auth_version = '2.0',
$endpoint_type = 'publicURL',
$swift_dir = '/etc/swift', $swift_dir = '/etc/swift',
$coverage = 1, $coverage = 1,
$retries = 5, $retries = 5,
@@ -85,6 +89,7 @@ class swift::dispersion (
'dispersion/auth_user': value => "${auth_tenant}:${auth_user}"; 'dispersion/auth_user': value => "${auth_tenant}:${auth_user}";
'dispersion/auth_key': value => $auth_pass; 'dispersion/auth_key': value => $auth_pass;
'dispersion/auth_version': value => $auth_version; 'dispersion/auth_version': value => $auth_version;
'dispersion/endpoint_type': value => $endpoint_type;
'dispersion/swift_dir': value => $swift_dir; 'dispersion/swift_dir': value => $swift_dir;
'dispersion/dispersion_coverage': value => $coverage; 'dispersion/dispersion_coverage': value => $coverage;
'dispersion/retries': value => $retries; 'dispersion/retries': value => $retries;

4
spec/classes/swift_dispersion_spec.rb
View File

@@ -8,6 +8,7 @@ describe 'swift::dispersion' do
:auth_tenant => 'services', :auth_tenant => 'services',
:auth_pass => 'dispersion_password', :auth_pass => 'dispersion_password',
:auth_version => '2.0', :auth_version => '2.0',
:endpoint_type => 'publicURL',
:swift_dir => '/etc/swift', :swift_dir => '/etc/swift',
:coverage => 1, :coverage => 1,
:retries => 5, :retries => 5,
@@ -51,6 +52,8 @@ describe 'swift::dispersion' do
'dispersion/auth_user').with_value("#{p[:auth_tenant]}:#{p[:auth_user]}") 'dispersion/auth_user').with_value("#{p[:auth_tenant]}:#{p[:auth_user]}")
should contain_swift_dispersion_config( should contain_swift_dispersion_config(
'dispersion/auth_key').with_value(p[:auth_pass]) 'dispersion/auth_key').with_value(p[:auth_pass])
should contain_swift_dispersion_config(
'dispersion/endpoint_type').with_value(p[:endpoint_type])
should contain_swift_dispersion_config( should contain_swift_dispersion_config(
'dispersion/swift_dir').with_value(p[:swift_dir]) 'dispersion/swift_dir').with_value(p[:swift_dir])
should contain_swift_dispersion_config( should contain_swift_dispersion_config(
@@ -86,6 +89,7 @@ describe 'swift::dispersion' do
:auth_tenant => 'bar', :auth_tenant => 'bar',
:auth_pass => 'dummy', :auth_pass => 'dummy',
:auth_version => '1.0', :auth_version => '1.0',
:endpoint_type => 'internalURL',
:swift_dir => '/usr/local/etc/swift', :swift_dir => '/usr/local/etc/swift',
:coverage => 42, :coverage => 42,
:retries => 51, :retries => 51,