openstack
/
puppet-designate
Code Issues Proposed changes

Merge "keystone/auth: make service description configurable"

This commit is contained in:
Jenkins 2015-07-08 16:04:09 +00:00 committed by Gerrit Code Review
parent f64c5c1a66 3f4a5903f4
commit 65c5c8c35a
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/keystone/auth.pp
View File

@ -23,6 +23,9 @@
# [*service_type*] # [*service_type*]
# Type of service. Optional. Defaults to 'metering'. # Type of service. Optional. Defaults to 'metering'.
# #
# [*service_description*]
# Description for keystone service. Optional. Defaults to 'Openstack DNSaas Service'.
#
# [*region*] # [*region*]
# Region for endpoint. Optional. Defaults to 'RegionOne'. # Region for endpoint. Optional. Defaults to 'RegionOne'.
# #
@ -100,6 +103,7 @@ class designate::keystone::auth (
$auth_name = 'designate', $auth_name = 'designate',
$service_name = undef, $service_name = undef,
$service_type = 'dns', $service_type = 'dns',
$service_description = 'Openstack DNSaas Service',
$region = 'RegionOne', $region = 'RegionOne',
$tenant = 'services', $tenant = 'services',
$configure_endpoint = true, $configure_endpoint = true,
@ -190,7 +194,7 @@ class designate::keystone::auth (
configure_endpoint => $configure_endpoint, configure_endpoint => $configure_endpoint,
service_name => $real_service_name, service_name => $real_service_name,
service_type => $service_type, service_type => $service_type,
service_description => 'Openstack DNSaas Service', service_description => $service_description,
region => $region, region => $region,
auth_name => $auth_name, auth_name => $auth_name,
password => $password, password => $password,