openstack/puppet-swift
Code Issues Proposed changes

Region changes

Browse Source
This commit is contained in:
Joe Topjian
2012-10-28 13:28:35 -06:00
parent f6e3ebb95f
commit 87ab008565
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/keystone/auth.pp
View File

@@ -2,7 +2,8 @@ class swift::keystone::auth(
$auth_name = 'swift', $auth_name = 'swift',
$password = 'swift_password', $password = 'swift_password',
$address = '127.0.0.1', $address = '127.0.0.1',
$port = '8080' $port = '8080',
$region = 'RegionOne'
) { ) {
keystone_user { $auth_name: keystone_user { $auth_name:
@@ -20,9 +21,8 @@ class swift::keystone::auth(
type => 'object-store', type => 'object-store',
description => 'Openstack Object-Store Service', description => 'Openstack Object-Store Service',
} }
keystone_endpoint { $auth_name: keystone_endpoint { "${region}/${auth_name}":
ensure => present, ensure => present,
region => 'RegionOne',
public_url => "http://${address}:${port}/v1/AUTH_%(tenant_id)s", public_url => "http://${address}:${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",
@@ -33,9 +33,8 @@ class swift::keystone::auth(
type => 's3', type => 's3',
description => 'Openstack S3 Service', description => 'Openstack S3 Service',
} }
keystone_endpoint { "${auth_name}_s3": keystone_endpoint { "${region}/${auth_name}_s3":
ensure => present, ensure => present,
region => 'RegionOne',
public_url => "http://${address}:${port}", public_url => "http://${address}:${port}",
admin_url => "http://${address}:${port}", admin_url => "http://${address}:${port}",
internal_url => "http://${address}:${port}", internal_url => "http://${address}:${port}",