openstack/puppet-swift
Code Issues Proposed changes

Adding the ability to specify https for the public endpoint

Browse Source
This commit is contained in:
Derek Higgins
2012-11-21 12:48:19 -05:00
parent a6f98ad3e3
commit 9cc14a9042
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/keystone/auth.pp
View File

@@ -5,7 +5,8 @@ class swift::keystone::auth(
$port = '8080', $port = '8080',
$tenant = 'services', $tenant = 'services',
$email = 'swift@localhost', $email = 'swift@localhost',
$region = 'RegionOne' $region = 'RegionOne',
$public_protocol = 'http'
) { ) {
keystone_user { $auth_name: keystone_user { $auth_name:
@@ -27,7 +28,7 @@ class swift::keystone::auth(
} }
keystone_endpoint { "${region}/${auth_name}": keystone_endpoint { "${region}/${auth_name}":
ensure => present, ensure => present,
public_url => "http://${address}:${port}/v1/AUTH_%(tenant_id)s", public_url => "${public_protocol}://${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",
} }
@@ -39,7 +40,7 @@ class swift::keystone::auth(
} }
keystone_endpoint { "${region}/${auth_name}_s3": keystone_endpoint { "${region}/${auth_name}_s3":
ensure => present, ensure => present,
public_url => "http://${address}:${port}", public_url => "${public_protocol}://${address}:${port}",
admin_url => "http://${address}:${port}", admin_url => "http://${address}:${port}",
internal_url => "http://${address}:${port}", internal_url => "http://${address}:${port}",
} }