Add 'page_size' parameter.
it adjusts maximum results per page. Change-Id: Iaae4b5d08d994c8c364dc88ebfdd213bdac92070 Related-Bug: #1569848
This commit is contained in:
parent
24e089e76f
commit
7d6afb9957
|
@ -42,6 +42,8 @@ class plugin_ldap::controller {
|
||||||
$group_allow_update = false
|
$group_allow_update = false
|
||||||
$group_allow_delete = false
|
$group_allow_delete = false
|
||||||
|
|
||||||
|
$page_size = $::fuel_settings['ldap']['page_size']
|
||||||
|
|
||||||
$domain = $::fuel_settings['ldap']['domain']
|
$domain = $::fuel_settings['ldap']['domain']
|
||||||
$use_tls = $::fuel_settings['ldap']['use_tls']
|
$use_tls = $::fuel_settings['ldap']['use_tls']
|
||||||
$ca_chain = pick($::fuel_settings['ldap']['ca_chain'], false)
|
$ca_chain = pick($::fuel_settings['ldap']['ca_chain'], false)
|
||||||
|
@ -89,6 +91,7 @@ class plugin_ldap::controller {
|
||||||
group_allow_create => $group_allow_create,
|
group_allow_create => $group_allow_create,
|
||||||
group_allow_update => $group_allow_update,
|
group_allow_update => $group_allow_update,
|
||||||
group_allow_delete => $group_allow_delete,
|
group_allow_delete => $group_allow_delete,
|
||||||
|
page_size => $page_size,
|
||||||
}
|
}
|
||||||
|
|
||||||
Plugin_ldap::Keystone<||> ~>
|
Plugin_ldap::Keystone<||> ~>
|
||||||
|
|
|
@ -30,6 +30,7 @@ define plugin_ldap::keystone (
|
||||||
$group_allow_create = undef,
|
$group_allow_create = undef,
|
||||||
$group_allow_update = undef,
|
$group_allow_update = undef,
|
||||||
$group_allow_delete = undef,
|
$group_allow_delete = undef,
|
||||||
|
$page_size = undef,
|
||||||
){
|
){
|
||||||
|
|
||||||
if $use_tls {
|
if $use_tls {
|
||||||
|
@ -100,6 +101,7 @@ define plugin_ldap::keystone (
|
||||||
"${domain}/ldap/group_allow_create": value => $group_allow_create;
|
"${domain}/ldap/group_allow_create": value => $group_allow_create;
|
||||||
"${domain}/ldap/group_allow_update": value => $group_allow_update;
|
"${domain}/ldap/group_allow_update": value => $group_allow_update;
|
||||||
"${domain}/ldap/group_allow_delete": value => $group_allow_delete;
|
"${domain}/ldap/group_allow_delete": value => $group_allow_delete;
|
||||||
|
"${domain}/ldap/page_size": value => $page_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
keystone_domain { "${domain}":
|
keystone_domain { "${domain}":
|
||||||
|
|
|
@ -35,6 +35,7 @@ define plugin_ldap::multiple_domain (
|
||||||
group_allow_create => $domain_params_hash['group_allow_create'],
|
group_allow_create => $domain_params_hash['group_allow_create'],
|
||||||
group_allow_update => $domain_params_hash['group_allow_update'],
|
group_allow_update => $domain_params_hash['group_allow_update'],
|
||||||
group_allow_delete => $domain_params_hash['group_allow_delete'],
|
group_allow_delete => $domain_params_hash['group_allow_delete'],
|
||||||
|
page_size => $domain_params_hash['page_size'],
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,9 +153,18 @@ attributes:
|
||||||
description: 'LDAP attribute mapped to description.'
|
description: 'LDAP attribute mapped to description.'
|
||||||
weight: 105
|
weight: 105
|
||||||
type: "text"
|
type: "text"
|
||||||
|
page_size:
|
||||||
|
value: '0'
|
||||||
|
label: 'Page Size Attribute'
|
||||||
|
description: 'Maximum results per page.'
|
||||||
|
weight: 110
|
||||||
|
type: "text"
|
||||||
|
regex:
|
||||||
|
source: '^[0-9]+$'
|
||||||
|
error: "Page size contains unexpected value. It must contain only numbers."
|
||||||
additional_domains:
|
additional_domains:
|
||||||
type: "textarea"
|
type: "textarea"
|
||||||
weight: 110
|
weight: 115
|
||||||
value: ''
|
value: ''
|
||||||
label: "List of additional Domains"
|
label: "List of additional Domains"
|
||||||
description: "Blocks of additional domains/parameters that should be created"
|
description: "Blocks of additional domains/parameters that should be created"
|
||||||
|
|
Loading…
Reference in New Issue