openstack/puppet-cinder
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:57:54 -05:00
parent 1712c47dd2
commit afd9be3f46
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/keystone/auth.pp
View File

@ -10,7 +10,8 @@ class cinder::keystone::auth (
$internal_address = '127.0.0.1', $internal_address = '127.0.0.1',
$port = '8776', $port = '8776',
$volume_version = 'v1', $volume_version = 'v1',
$region = 'RegionOne' $region = 'RegionOne',
$public_protocol = 'http'
) { ) {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'cinder-api' |> Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'cinder-api' |>
@ -34,7 +35,7 @@ class cinder::keystone::auth (
if $configure_endpoint { if $configure_endpoint {
keystone_endpoint { "${region}/$auth_name": keystone_endpoint { "${region}/$auth_name":
ensure => present, ensure => present,
public_url => "http://${public_address}:${port}/${volume_version}/%(tenant_id)s", public_url => "${public_protocol}://${public_address}:${port}/${volume_version}/%(tenant_id)s",
admin_url => "http://${admin_address}:${port}/${volume_version}/%(tenant_id)s", admin_url => "http://${admin_address}:${port}/${volume_version}/%(tenant_id)s",
internal_url => "http://${internal_address}:${port}/${volume_version}/%(tenant_id)s", internal_url => "http://${internal_address}:${port}/${volume_version}/%(tenant_id)s",
} }