openstack
/
puppet-glance
Code Issues Proposed changes

Merge pull request #64 from puppetlabs/master 

merge master commit to folsom branch
This commit is contained in:
Dan Bode 2012-11-21 18:59:23 -08:00
parent db270cfe0e 6f16dc953a
commit a4e18fab8c
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

@ -25,7 +25,8 @@ class glance::keystone::auth(
$internal_address = '127.0.0.1',
$port = '9292',
$region = 'RegionOne',
$tenant = 'services'
$tenant = 'services',
$public_protocol = 'http'
) {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-registry' |>
@ -49,7 +50,7 @@ class glance::keystone::auth(
if $configure_endpoint {
keystone_endpoint { "${region}/$auth_name":
ensure => present,
public_url => "http://${public_address}:${port}/v1",
public_url => "${public_protocol}://${public_address}:${port}/v1",
admin_url => "http://${admin_address}:${port}/v1",
internal_url => "http://${internal_address}:${port}/v1",
}