openstack/puppet-swift
Code Issues Proposed changes

Allow to have a different internal address and public address

Browse Source 
Change-Id: Id87323393a3bfd0ac3c9bc80fa2f46775e102eea
This commit is contained in:
Mehdi Abaakouk
2013-01-21 10:30:18 +01:00
committed by Mehdi Abaakouk
parent f849e5d572
commit e437b44d44
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/keystone/auth.pp
View File

@@ -7,6 +7,7 @@ class swift::keystone::auth(
$email = 'swift@localhost', $email = 'swift@localhost',
$region = 'RegionOne', $region = 'RegionOne',
$public_protocol = 'http', $public_protocol = 'http',
$public_address = undef,
$public_port = undef $public_port = undef
) { ) {
@@ -15,6 +16,13 @@ class swift::keystone::auth(
} else { } else {
$real_public_port = $public_port $real_public_port = $public_port
} }
if ! $public_address {
$real_public_address = $address
} else {
$real_public_address = $public_address
}
keystone_user { $auth_name: keystone_user { $auth_name:
ensure => present, ensure => present,
password => $password, password => $password,
@@ -34,7 +42,7 @@ class swift::keystone::auth(
} }
keystone_endpoint { "${region}/${auth_name}": keystone_endpoint { "${region}/${auth_name}":
ensure => present, ensure => present,
public_url => "${public_protocol}://${address}:${real_public_port}/v1/AUTH_%(tenant_id)s", public_url => "${public_protocol}://${real_public_address}:${real_public_port}/v1/AUTH_%(tenant_id)s",
admin_url => "http://${address}:${port}/", admin_url => "http://${address}:${port}/",
internal_url => "http://${address}:${port}/v1/AUTH_%(tenant_id)s", internal_url => "http://${address}:${port}/v1/AUTH_%(tenant_id)s",
} }
@@ -46,7 +54,7 @@ class swift::keystone::auth(
} }
keystone_endpoint { "${region}/${auth_name}_s3": keystone_endpoint { "${region}/${auth_name}_s3":
ensure => present, ensure => present,
public_url => "${public_protocol}://${address}:${real_public_port}", public_url => "${public_protocol}://${real_public_address}:${real_public_port}",
admin_url => "http://${address}:${port}", admin_url => "http://${address}:${port}",
internal_url => "http://${address}:${port}", internal_url => "http://${address}:${port}",
} }

9
spec/classes/swift_keystone_auth_spec.rb
View File

@@ -42,24 +42,25 @@ describe 'swift::keystone::auth' do
) } ) }
end end
describe 'when overriding public_port' do describe 'when overriding public_port and public address' do
let :params do let :params do
{ {
:public_port => '80' :public_port => '80',
:public_address => '10.10.10.10'
} }
end end
it { should contain_keystone_endpoint('RegionOne/swift').with( it { should contain_keystone_endpoint('RegionOne/swift').with(
:ensure => 'present', :ensure => 'present',
:public_url => "http://127.0.0.1:80/v1/AUTH_%(tenant_id)s", :public_url => "http://10.10.10.10:80/v1/AUTH_%(tenant_id)s",
:admin_url => "http://127.0.0.1:8080/", :admin_url => "http://127.0.0.1:8080/",
:internal_url => "http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s" :internal_url => "http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s"
) } ) }
it { should contain_keystone_endpoint('RegionOne/swift_s3').with( it { should contain_keystone_endpoint('RegionOne/swift_s3').with(
:ensure => 'present', :ensure => 'present',
:public_url => 'http://127.0.0.1:80', :public_url => 'http://10.10.10.10:80',
:admin_url => 'http://127.0.0.1:8080', :admin_url => 'http://127.0.0.1:8080',
:internal_url => 'http://127.0.0.1:8080' :internal_url => 'http://127.0.0.1:8080'
) } ) }