openstack/puppet-swift
Code Issues Proposed changes

Merge pull request #73 from derekhiggins/https_endpoint

Browse Source 
Adding the ability to specify https for the public endpoint
This commit is contained in:
Dan Bode 2012-12-03 14:42:38 -08:00
commit e9f9c99fe8
1 changed files with 4 additions and 3 deletions

7
manifests/keystone/auth.pp

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