Skip to content

Commit

Permalink
Unify parameter arguments between classes.
Browse files Browse the repository at this point in the history
ceph::rgw::keystone and ceph::rgw:keystone::auth used
different parameter defaults. This patch makes both use
ceph::profile::params

Change-Id: Ic55960841f4e42e66a4a04be1976a2b205db2cdc
Depends-On: Ie9b8113351300ab8ab331f083a47fef7d4735e69
  • Loading branch information
kschinck committed Nov 29, 2016
1 parent ba23b0a commit 3bb76e7
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions manifests/rgw/keystone/auth.pp
Expand Up @@ -5,11 +5,12 @@
# === Parameters
#
# [*password*]
# Password for the RGW user. Required
# Password for the RGW user.
# Defaults to ceph::profile::params::rgw_keystone_admin_password
#
# [*user*]
# Username for the RGW user. Optional.
# Defaults to 'rgwuser'
# Defaults to ceph::profile::params::rgw_keystone_admin_use
#
# [*email*]
# Email for the RGW user. Optional.
Expand Down Expand Up @@ -37,23 +38,23 @@
#
# [*tenant*]
# Tenant for user. Optional.
# Defaults to 'services'
# Defaults to ceph::profile::params::rgw_keystone_admin_project
#
# [*rgw_service*]
# Name of the keystone service used by RGW
# Defaults to 'swift::object-store'
#

class ceph::rgw::keystone::auth (
$password,
$user = 'rgwuser',
$password = $::ceph::profile::params::rgw_keystone_admin_password,
$user = $::ceph::profile::params::rgw_keystone_admin_user,
$email = 'rgwuser@localhost',
$roles = ['admin', 'Member'],
$public_url = 'http://127.0.0.1:8080/swift/v1',
$admin_url = 'http://127.0.0.1:8080/swift/v1',
$internal_url = 'http://127.0.0.1:8080/swift/v1',
$region = 'RegionOne',
$tenant = 'services',
$tenant = $::ceph::profile::params::rgw_keystone_admin_project,
$rgw_service = 'swift::object-store',
) {

Expand Down

0 comments on commit 3bb76e7

Please sign in to comment.