x
/
puppet-tuskar
Code Issues Proposed changes

keystone/auth: make service description configurable 

This commit adds the service description as a class parameter in order to allow
users to update from a previous version if the service description is changed
(incorrectly spelled or wrong description)

Change-Id: I490dfdc96254967aff0acd64bf4cb2648820fe49
Closes-Bug: #1468407
This commit is contained in:
Sebastien Badia 2015-06-24 17:49:12 +02:00
parent d3da602940
commit aefad7cc29
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manifests/keystone/auth.pp
View File

@ -39,6 +39,9 @@
# [*service_type*] # [*service_type*]
# Type of service. Defaults to 'management'. # Type of service. Defaults to 'management'.
# #
# [*service_description*]
# Description for keystone service. Optional. Defaults to 'Tuskar Management Service'.
#
# [*public_protocol*] # [*public_protocol*]
# Protocol for public endpoint. Defaults to 'http'. # Protocol for public endpoint. Defaults to 'http'.
# #
@ -69,20 +72,21 @@
# #
class tuskar::keystone::auth ( class tuskar::keystone::auth (
$password, $password,
$auth_name = 'tuskar', $auth_name = 'tuskar',
$email = 'tuskar@localhost', $email = 'tuskar@localhost',
$tenant = 'services', $tenant = 'services',
$configure_endpoint = true, $configure_endpoint = true,
$service_type = 'management', $service_type = 'management',
$public_protocol = 'http', $service_description = 'Tuskar Management Service',
$public_address = '127.0.0.1', $public_protocol = 'http',
$admin_protocol = 'http', $public_address = '127.0.0.1',
$admin_address = '127.0.0.1', $admin_protocol = 'http',
$internal_protocol = 'http', $admin_address = '127.0.0.1',
$internal_address = '127.0.0.1', $internal_protocol = 'http',
$port = '8585', $internal_address = '127.0.0.1',
$public_port = undef, $port = '8585',
$region = 'RegionOne' $public_port = undef,
$region = 'RegionOne'
) { ) {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'tuskar-api' |> Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'tuskar-api' |>
@ -99,7 +103,7 @@ class tuskar::keystone::auth (
configure_user_role => true, configure_user_role => true,
configure_endpoint => $configure_endpoint, configure_endpoint => $configure_endpoint,
service_type => $service_type, service_type => $service_type,
service_description => 'Tuskar Management Service', service_description => $service_description,
region => $region, region => $region,
password => $password, password => $password,
email => $email, email => $email,