@ -13,17 +13,12 @@
# accepts latest or specific versions.
# Defaults to present.
#
# [*catalog_type*]
# (Optional) Type of catalog that keystone uses to store endpoints,services.
# Defaults to sql. (Also accepts template)
#
# [*catalog_driver*]
# (Optional) Catalog driver used by Keystone to store endpoints and services.
# Setting this value will override and ignore catalog_type.
# Defaults to false.
#
# [*catalog_template_file*]
# (Optional) Path to the catalog used if catalog_type equals 'template' .
# (Optional) Path to the catalog used if 'templated' catalog driver is used .
# Defaults to '/etc/keystone/default_catalog.templates'
#
# [*token_provider*]
@ -374,6 +369,11 @@
# Sample value: 'http://localhost:5000/'
# Defaults to undef
#
# [*catalog_type*]
# (Optional) Type of catalog that keystone uses to store endpoints, services.
# This accepts sql or template.
# Defaults to undef.
#
# == Authors
#
# Dan Bode dan@puppetlabs.com
@ -387,7 +387,6 @@ class keystone(
$client_package_ensure = 'present' ,
$log_dir = undef ,
$log_file = undef ,
$catalog_type = 'sql' ,
$catalog_driver = false ,
$catalog_template_file = '/etc/keystone/default_catalog.templates' ,
$token_provider = 'fernet' ,
@ -450,14 +449,18 @@ class keystone(
$member_role_id = undef ,
$member_role_name = undef ,
$admin_endpoint = undef ,
$catalog_type = undef ,
) inherits keystone : : params {
include keystone : : deps
include keystone : : logging
include keystone : : policy
if ! $catalog_driver {
validate_legacy ( Enum [ 'template' , 'sql' ] , 'validate_re' , $catalog_type)
if $catalog_type ! = undef {
warning ( 'The catalog_type parameter is deprecated. Use the catalog_driver parameter instead.' )
if ! $catalog_driver {
validate_legacy ( Enum [ 'template' , 'sql' ] , 'validate_re' , $catalog_type)
}
}
if $manage_policyrcd {
@ -566,7 +569,7 @@ class keystone(
elsif ( $catalog_type = = 'template' ) {
$catalog_driver_real = 'templated'
}
els if ( $catalog_typ e = = 'sql' ) {
els e {
$catalog_driver_real = 'sql'
}