Commit f2d5169513698f241e270f44218ab9c627524cfe - puppet-module-gnocchi

Merge tag '15.2.0' into debian/train puppet-gnocchi 15.2.0 release meta:version: 15.2.0 meta:diff-start: - meta:series: train meta:release-type: release meta:pypi: no meta:first: no meta:release:Author: ZhongShengping <chdzsp@163.com> meta:release:Commit: ZhongShengping <chdzsp@163.com> meta:release:Change-Id: I1621938129c001a793ef9d4c3279c1b9126d2d41 meta:release:Code-Review+2: Thierry Carrez <thierry@openstack.org> meta:release:Code-Review+2: Sean McGinnis <sean.mcginnis@gmail.com> meta:release:Workflow+1: Sean McGinnis <sean.mcginnis@gmail.com> Thomas Goirand 4 years ago

20 changed file(s) with 60 addition(s) and 56 deletion(s). Raw diff Collapse all Expand all

-1

.gitreview less more

0	0	[gerrit]
1		host=review.openstack.org
	1	host=review.opendev.org
2	2	port=29418
3	3	project=openstack/puppet-gnocchi.git

-1

Gemfile less more

6	6	:require => 'false'
7	7	else
8	8	gem 'puppet-openstack_spec_helper',
9		:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
	9	:git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
10	10	:require => 'false'
11	11	end
12	12	end

-2

README.md less more

22	22	Overview
23	23	--------
24	24
25		The gnocchi module is a part of [OpenStack](https://git.openstack.org), an effort by the OpenStack infrastructure team to provide continuous integration testing and code review for OpenStack and OpenStack community projects as part of the core software. The module itself is used to flexibly configure and manage the management service for OpenStack.
	25	The gnocchi module is a part of [OpenStack](https://opendev.org/openstack), an effort by the OpenStack infrastructure team to provide continuous integration testing and code review for OpenStack and OpenStack community projects as part of the core software. The module itself is used to flexibly configure and manage the management service for OpenStack.
26	26
27	27	Module Description
28	28	------------------

113	113	Repository
114	114	----------
115	115
116		* https://git.openstack.org/cgit/openstack/puppet-gnocchi
	116	* https://opendev.org/openstack/puppet-gnocchi

-2

doc/requirements.txt less more

0	0	# This is required for the docs build jobs
1		sphinx # BSD
2		openstackdocstheme # Apache-2.0
	1	sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
	2	sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
	3	openstackdocstheme>=1.20.0 # Apache-2.0
3	4
4	5	# This is required for the releasenotes build jobs
5	6	reno # Apache-2.0

-0

manifests/api.pp less more

41	41	# HTTPProxyToWSGI middleware.
42	42	# Defaults to $::os_service_default.
43	43	#
	44	# [max_request_body_size]
	45	# (Optional) Set max request body size
	46	# Defaults to $::os_service_default.
	47	#
44	48	# [middlewares]
45	49	# (optional) Middlewares to use.
46	50	# Defaults to $::os_service_default

54	58	$sync_db = false,
55	59	$auth_strategy = 'keystone',
56	60	$enable_proxy_headers_parsing = $::os_service_default,
	61	$max_request_body_size = $::os_service_default,
57	62	$middlewares = $::os_service_default,
58	63	) inherits gnocchi::params {
59	64

113	118
114	119	oslo::middleware { 'gnocchi_config':
115	120	enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
	121	max_request_body_size => $max_request_body_size,
116	122	}
117	123
118	124	if $auth_strategy == 'keystone' {

-0

manifests/client.pp less more

17	17	tag => 'openstack',
18	18	}
19	19
	20	include '::openstacklib::openstackclient'
	21
20	22	}
21	23

-30

manifests/keystone/authtoken.pp less more

165	165	# compared against a list of possible roles for validity
166	166	# true/false
167	167	# Defaults to $::os_service_default.
168		#
169		# DEPRECATED PARAMETERS
170		#
171		# [check_revocations_for_cached]
172		# (Optional) If true, the revocation list will be checked for cached tokens.
173		# This requires that PKI tokens are configured on the identity server.
174		# boolean value.
175		# Defaults to undef
176		#
177		# [hash_algorithms]
178		# (Optional) Hash algorithms to use for hashing PKI tokens. This may be a
179		# single algorithm or multiple. The algorithms are those supported by Python
180		# standard hashlib.new(). The hashes will be tried in the order given, so put
181		# the preferred one first for performance. The result of the first hash will
182		# be stored in the cache. This will typically be set to multiple values only
183		# while migrating from a less secure algorithm to a more secure one. Once all
184		# the old tokens are expired this option should be set to a single value for
185		# better performance. List value.
186		# Defaults to undef.
187	168	#
188	169	class gnocchi::keystone::authtoken(
189	170	$username = 'gnocchi',

219	200	$region_name = $::os_service_default,
220	201	$token_cache_time = $::os_service_default,
221	202	$service_token_roles_required = $::os_service_default,
222		# DEPRECATED PARAMETERS
223		$check_revocations_for_cached = undef,
224		$hash_algorithms = undef,
225	203	) {
226	204
227	205	include ::gnocchi::deps
228	206
229	207	if is_service_default($password) {
230	208	fail('Please set password for Gnocchi service user')
231		}
232
233		if $check_revocations_for_cached {
234		warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.')
235		}
236
237		if $hash_algorithms {
238		warning('hash_algorithms parameter is deprecated, has no effect and will be removed in the future.')
239	209	}
240	210
241	211	keystone::resource::authtoken { 'gnocchi_config':

-1

manifests/storage/ceph.pp less more

82	82	'storage/driver': value => 'ceph';
83	83	'storage/ceph_username': value => $ceph_username;
84	84	'storage/ceph_keyring': value => $ceph_keyring;
85		'storage/ceph_secret': value => $ceph_secret;
	85	'storage/ceph_secret': value => $ceph_secret, secret => true;
86	86	'storage/ceph_pool': value => $ceph_pool;
87	87	'storage/ceph_conffile': value => $ceph_conffile;
88	88	}

-0

manifests/storage/s3.pp less more

20	20	# (optional) S3 storage secret access key.
21	21	# Defaults to undef
22	22	#
	23	# [s3_bucket_prefix]
	24	# (optional) S3 bucket prefix for gnocchi
	25	# Defaults to undef
23	26	#
24	27	class gnocchi::storage::s3(
25	28	$s3_endpoint_url = $::os_service_default,
26	29	$s3_region_name = $::os_service_default,
27	30	$s3_access_key_id = undef,
28	31	$s3_secret_access_key = undef,
	32	$s3_bucket_prefix = $::os_service_default,
29	33	) {
30	34
31	35	include ::gnocchi::deps

36	40	'storage/s3_region_name': value => $s3_region_name;
37	41	'storage/s3_access_key_id': value => $s3_access_key_id;
38	42	'storage/s3_secret_access_key': value => $s3_secret_access_key;
	43	'storage/s3_bucket_prefix': value => $s3_bucket_prefix;
39	44	}
40	45
41	46	}

-4

metadata.json less more

6	6	},
7	7	{
8	8	"name": "openstack/keystone",
9		"version_requirement": ">=14.4.0 <15.0.0"
	9	"version_requirement": ">=15.2.0 <16.0.0"
10	10	},
11	11	{
12	12	"name": "puppetlabs/stdlib",

18	18	},
19	19	{
20	20	"name": "openstack/openstacklib",
21		"version_requirement": ">=14.4.0 <15.0.0"
	21	"version_requirement": ">=15.2.0 <16.0.0"
22	22	},
23	23	{
24	24	"name": "openstack/oslo",
25		"version_requirement": ">=14.4.0 <15.0.0"
	25	"version_requirement": ">=15.2.0 <16.0.0"
26	26	}
27	27	],
28	28	"description": "Installs and configures OpenStack Gnocchi (Metric & index storage API).",

64	64	],
65	65	"source": "git://github.com/openstack/puppet-gnocchi.git",
66	66	"summary": "Puppet module for OpenStack Gnocchi",
67		"version": "14.4.0"
	67	"version": "15.2.0"
68	68	}

-0

releasenotes/notes/add-openstackclient-client-ab8c46a274ff4349.yaml less more

	0	---
	1	features:
	2	- Add openstackclient installation to the client class.

-0

releasenotes/notes/max_request_body_size-99d457dd976374cc.yaml less more

	0	---
	1	features:
	2	- \|
	3	Add support to configure `[oslo_middleware]/max_request_body_size` with
	4	`$max_request_body_size`.

-0

releasenotes/notes/remove_deprecated_pki_related_options-8d7fe0e0c58fc48e.yaml less more

	0	---
	1	upgrade:
	2	- \|
	3	The deprecated pki related options check_revocations_for_cached and
	4	hash_algorithms option has been removed.

-13

releasenotes/source/conf.py less more

44	44	master_doc = 'index'
45	45
46	46	# General information about the project.
47		project = u'puppet-gnocchi Release Notes'
48	47	copyright = u'2017, Puppet OpenStack Developers'
49	48
50	49	# The version info for the project you're documenting, acts as replacement for

137	136
138	137	# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
139	138	# using the given strftime format.
140		html_last_updated_fmt = '%Y-%m-%d %H:%M'
141	139
142	140	# If true, SmartyPants will be used to convert quotes and dashes to
143	141	# typographically correct entities.

181	179
182	180
183	181	# -- Options for LaTeX output ---------------------------------------------
184
185		latex_elements = {
186		# The paper size ('letterpaper' or 'a4paper').
187		#'papersize': 'letterpaper',
188
189		# The font size ('10pt', '11pt' or '12pt').
190		#'pointsize': '10pt',
191
192		# Additional stuff for the LaTeX preamble.
193		#'preamble': '',
194		}
195	182
196	183	# Grouping the document tree into LaTeX files. List of tuples
197	184	# (source start file, target name, title,

-0

releasenotes/source/index.rst less more

8	8	:maxdepth: 2
9	9
10	10	unreleased
	11	stein
11	12	rocky
12	13	queens
13	14	pike

-0

releasenotes/source/stein.rst less more

	0	===================================
	1	Stein Series Release Notes
	2	===================================
	3
	4	.. release-notes::
	5	:branch: stable/stein

+11

-0

spec/classes/gnocchi_api_spec.rb less more

62	62	is_expected.to contain_gnocchi_config('api/middlewares').with_value('<SERVICE DEFAULT>')
63	63	is_expected.to contain_oslo__middleware('gnocchi_config').with(
64	64	:enable_proxy_headers_parsing => '<SERVICE DEFAULT>',
	65	:max_request_body_size => '<SERVICE DEFAULT>',
65	66	)
66	67	end
67	68

164	165	)}
165	166	end
166	167
	168	context 'with max_request_body_size' do
	169	before do
	170	params.merge!({:max_request_body_size => '102400' })
	171	end
	172
	173	it { is_expected.to contain_oslo__middleware('gnocchi_config').with(
	174	:max_request_body_size => '102400',
	175	)}
	176	end
	177
167	178	end
168	179
169	180	on_supported_os({

-0

spec/classes/gnocchi_client_spec.rb less more

9	9	:name => platform_params[:client_package_name],
10	10	:tag => 'openstack',
11	11	)}
	12
	13	it { is_expected.to contain_class('openstacklib::openstackclient') }
12	14	end
13	15
14	16	on_supported_os({

-1

spec/classes/gnocchi_storage_ceph_spec.rb less more

30	30	params.merge!({
31	31	:ceph_secret => 'secrete'})
32	32	end
33		it { is_expected.to contain_gnocchi_config('storage/ceph_secret').with_value('secrete') }
	33	it { is_expected.to contain_gnocchi_config('storage/ceph_secret').with_value('secrete').with_secret(true) }
34	34	end
35	35
36	36	context 'without required parameters' do

-1

tox.ini less more

3	3	envlist = releasenotes
4	4
5	5	[testenv]
6		install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
	6	install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages}
7	7
8	8	[testenv:releasenotes]
9	9	basepython = python3