Codebase list puppet-module-gnocchi / b112685
Merge tag '15.4.0' into debian/train puppet-gnocchi 15.4.0 release meta:version: 15.4.0 meta:diff-start: - meta:series: train meta:release-type: release meta:pypi: no meta:first: no meta:release:Author: Emilien Macchi <emilien@redhat.com> meta:release:Commit: Emilien Macchi <emilien@redhat.com> meta:release:Change-Id: Ia7c2bf3f2d47de4b2cbd4839b6ada23f278485a9 meta:release:Code-Review+1: yatin <ykarel@redhat.com> meta:release:Code-Review+1: Alfredo Moralejo <amoralej@redhat.com> meta:release:Code-Review+2: Thierry Carrez <thierry@openstack.org> meta:release:Code-Review+2: Jean-Philippe Evrard <jean-philippe@evrard.me> meta:release:Workflow+1: Jean-Philippe Evrard <jean-philippe@evrard.me> Thomas Goirand 4 years ago
5 changed file(s) with 24 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all
+12
-0
manifests/keystone/authtoken.pp less more
158158 # (Optional) In order to prevent excessive effort spent validating tokens,
159159 # the middleware caches previously-seen tokens for a configurable duration
160160 # (in seconds). Set to -1 to disable caching completely. Integer value
161 # Defaults to $::os_service_default.
162 #
163 # [*service_token_roles*]
164 # (Optional) A choice of roles that must be present in a service token.
165 # Service tokens are allowed to request that an expired token
166 # can be used and so this check should tightly control that
167 # only actual services should be sending this token. Roles
168 # here are applied as an ANY check so any role in this list
169 # must be present. For backwards compatibility reasons this
170 # currently only affects the allow_expired check. (list value)
161171 # Defaults to $::os_service_default.
162172 #
163173 # [*service_token_roles_required*]
199209 $manage_memcache_package = false,
200210 $region_name = $::os_service_default,
201211 $token_cache_time = $::os_service_default,
212 $service_token_roles = $::os_service_default,
202213 $service_token_roles_required = $::os_service_default,
203214 ) {
204215
241252 manage_memcache_package => $manage_memcache_package,
242253 region_name => $region_name,
243254 token_cache_time => $token_cache_time,
255 service_token_roles => $service_token_roles,
244256 service_token_roles_required => $service_token_roles_required,
245257 }
246258 }
+4
-4
metadata.json less more
66 },
77 {
88 "name": "openstack/keystone",
9 "version_requirement": ">=15.2.0 <16.0.0"
9 "version_requirement": ">=15.4.0 <16.0.0"
1010 },
1111 {
1212 "name": "puppetlabs/stdlib",
1818 },
1919 {
2020 "name": "openstack/openstacklib",
21 "version_requirement": ">=15.2.0 <16.0.0"
21 "version_requirement": ">=15.4.0 <16.0.0"
2222 },
2323 {
2424 "name": "openstack/oslo",
25 "version_requirement": ">=15.2.0 <16.0.0"
25 "version_requirement": ">=15.4.0 <16.0.0"
2626 }
2727 ],
2828 "description": "Installs and configures OpenStack Gnocchi (Metric & index storage API).",
6464 ],
6565 "source": "git://github.com/openstack/puppet-gnocchi.git",
6666 "summary": "Puppet module for OpenStack Gnocchi",
67 "version": "15.2.0"
67 "version": "15.4.0"
6868 }
+4
-0
releasenotes/notes/service_token_roles-9955b67a04160949.yaml less more
0 ---
1 features:
2 - |
3 Add support to configure service_token_roles in authtoken middleware.
+3
-0
spec/classes/gnocchi_keystone_authtoken_spec.rb less more
4141 is_expected.to contain_gnocchi_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
4242 is_expected.to contain_gnocchi_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
4343 is_expected.to contain_gnocchi_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
44 is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
4445 is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
4546 end
4647 end
8081 :manage_memcache_package => true,
8182 :region_name => 'region2',
8283 :token_cache_time => '301',
84 :service_token_roles => ['service'],
8385 :service_token_roles_required => false,
8486 })
8587 end
116118 is_expected.to contain_gnocchi_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
117119 is_expected.to contain_gnocchi_config('keystone_authtoken/region_name').with_value(params[:region_name])
118120 is_expected.to contain_gnocchi_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
121 is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
119122 is_expected.to contain_gnocchi_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
120123 end
121124
+1
-1
tox.ini less more
33 envlist = releasenotes
44
55 [testenv]
6 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
6 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
77
88 [testenv:releasenotes]
99 basepython = python3