1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Description: Trixie support
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2025-06-03
Index: puppet-module-rally/manifests/config.pp
===================================================================
--- puppet-module-rally.orig/manifests/config.pp
+++ puppet-module-rally/manifests/config.pp
@@ -26,7 +26,5 @@ class rally::config (
include rally::deps
- validate_legacy(Hash, 'validate_hash', $rally_config)
-
create_resources('rally_config', $rally_config)
}
Index: puppet-module-rally/manifests/db/mysql.pp
===================================================================
--- puppet-module-rally.orig/manifests/db/mysql.pp
+++ puppet-module-rally/manifests/db/mysql.pp
@@ -45,8 +45,6 @@ class rally::db::mysql(
include rally::deps
- validate_legacy(String, 'validate_string', $password)
-
::openstacklib::db::mysql { 'rally':
user => $user,
password => $password,
Index: puppet-module-rally/manifests/db.pp
===================================================================
--- puppet-module-rally.orig/manifests/db.pp
+++ puppet-module-rally/manifests/db.pp
@@ -69,12 +69,12 @@ class rally::db (
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
}
- $database_connection_real = pick($::rally::database_connection, $database_connection)
- $database_connection_recycle_time_real = pick($::rally::database_idle_timeout, $database_connection_recycle_time)
- $database_max_pool_size_real = pick($::rally::database_max_pool_size, $database_max_pool_size)
- $database_max_retries_real = pick($::rally::database_max_retries, $database_max_retries)
- $database_retry_interval_real = pick($::rally::database_retry_interval, $database_retry_interval)
- $database_max_overflow_real = pick($::rally::database_max_overflow, $database_max_overflow)
+ $database_connection_real = $database_connection
+ $database_connection_recycle_time_real = $database_connection_recycle_time
+ $database_max_pool_size_real = $database_max_pool_size
+ $database_max_retries_real = $database_max_retries
+ $database_retry_interval_real = $database_retry_interval
+ $database_max_overflow_real = $database_max_overflow
# This is only for rally SQLite
if $database_connection_real =~ /^sqlite:\/\// {
Index: puppet-module-rally/manifests/params.pp
===================================================================
--- puppet-module-rally.orig/manifests/params.pp
+++ puppet-module-rally/manifests/params.pp
@@ -5,7 +5,7 @@
class rally::params {
include openstacklib::defaults
- case $::osfamily {
+ case $facts['os']['family'] {
'RedHat': {
$package_name = 'openstack-rally'
}
|
