openstack/fuel-library
Code Issues Proposed changes

Merge "Fix keystone_endpoint in ceph module"

Browse Source
This commit is contained in:
Jenkins 2014-11-07 10:05:19 +00:00 committed by Gerrit Code Review
commit 1d12d2e0be
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/puppet/ceph/manifests/keystone.pp
View File

@ -1,8 +1,9 @@
#ceph::keystone will configure keystone with ceph parts
class ceph::keystone (
$pub_ip = $::ceph::rgw_pub_ip,
$adm_ip = $::ceph::rgw_adm_ip,
$int_ip = $::ceph::rgw_int_ip,
$pub_ip = $::ceph::rgw_pub_ip,
$adm_ip = $::ceph::rgw_adm_ip,
$int_ip = $::ceph::rgw_int_ip,
$region = 'RegionOne',
$swift_endpoint_port = $::ceph::swift_endpoint_port,
) {
keystone_service {'swift':
@ -11,9 +12,8 @@ class ceph::keystone (
description => 'Openstack Object-Store Service',
}
keystone_endpoint {'swift':
keystone_endpoint {"$region/swift":
ensure => present,
region => 'RegionOne',
public_url => "http://${pub_ip}:${swift_endpoint_port}/swift/v1",
admin_url => "http://${adm_ip}:${swift_endpoint_port}/swift/v1",
internal_url => "http://${int_ip}:${swift_endpoint_port}/swift/v1",