From 7d6afb99570e464640a0a7c68e4c066a02b6e386 Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Tue, 14 Jun 2016 23:22:50 +0300 Subject: [PATCH] Add 'page_size' parameter. it adjusts maximum results per page. Change-Id: Iaae4b5d08d994c8c364dc88ebfdd213bdac92070 Related-Bug: #1569848 --- .../modules/plugin_ldap/manifests/controller.pp | 3 +++ .../puppet/modules/plugin_ldap/manifests/keystone.pp | 2 ++ .../modules/plugin_ldap/manifests/multiple_domain.pp | 1 + environment_config.yaml | 11 ++++++++++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/deployment_scripts/puppet/modules/plugin_ldap/manifests/controller.pp b/deployment_scripts/puppet/modules/plugin_ldap/manifests/controller.pp index 62054a5..6b12bd2 100644 --- a/deployment_scripts/puppet/modules/plugin_ldap/manifests/controller.pp +++ b/deployment_scripts/puppet/modules/plugin_ldap/manifests/controller.pp @@ -42,6 +42,8 @@ class plugin_ldap::controller { $group_allow_update = false $group_allow_delete = false + $page_size = $::fuel_settings['ldap']['page_size'] + $domain = $::fuel_settings['ldap']['domain'] $use_tls = $::fuel_settings['ldap']['use_tls'] $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_update => $group_allow_update, group_allow_delete => $group_allow_delete, + page_size => $page_size, } Plugin_ldap::Keystone<||> ~> diff --git a/deployment_scripts/puppet/modules/plugin_ldap/manifests/keystone.pp b/deployment_scripts/puppet/modules/plugin_ldap/manifests/keystone.pp index d9ee157..1290b78 100644 --- a/deployment_scripts/puppet/modules/plugin_ldap/manifests/keystone.pp +++ b/deployment_scripts/puppet/modules/plugin_ldap/manifests/keystone.pp @@ -30,6 +30,7 @@ define plugin_ldap::keystone ( $group_allow_create = undef, $group_allow_update = undef, $group_allow_delete = undef, + $page_size = undef, ){ if $use_tls { @@ -100,6 +101,7 @@ define plugin_ldap::keystone ( "${domain}/ldap/group_allow_create": value => $group_allow_create; "${domain}/ldap/group_allow_update": value => $group_allow_update; "${domain}/ldap/group_allow_delete": value => $group_allow_delete; + "${domain}/ldap/page_size": value => $page_size; } keystone_domain { "${domain}": diff --git a/deployment_scripts/puppet/modules/plugin_ldap/manifests/multiple_domain.pp b/deployment_scripts/puppet/modules/plugin_ldap/manifests/multiple_domain.pp index d56f8df..d694755 100644 --- a/deployment_scripts/puppet/modules/plugin_ldap/manifests/multiple_domain.pp +++ b/deployment_scripts/puppet/modules/plugin_ldap/manifests/multiple_domain.pp @@ -35,6 +35,7 @@ define plugin_ldap::multiple_domain ( group_allow_create => $domain_params_hash['group_allow_create'], group_allow_update => $domain_params_hash['group_allow_update'], group_allow_delete => $domain_params_hash['group_allow_delete'], + page_size => $domain_params_hash['page_size'], } } diff --git a/environment_config.yaml b/environment_config.yaml index f56127a..63c4dde 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -153,9 +153,18 @@ attributes: description: 'LDAP attribute mapped to description.' weight: 105 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: type: "textarea" - weight: 110 + weight: 115 value: '' label: "List of additional Domains" description: "Blocks of additional domains/parameters that should be created"