Skip to content

Commit 2580cf5

Browse files
austbaustb
committed
Merge puppetlabs#307 into master
2 parents c4ce13b + f980f76 commit 2580cf5

File tree

3 files changed

+174
-155
lines changed

3 files changed

+174
-155
lines changed

‎manifests/init.pp‎

Lines changed: 82 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,87 @@
11
# All in one class for setting up a PuppetDB instance. See README.md for more
22
# details.
33
class puppetdb (
4-
$listen_address = $puppetdb::params::listen_address,
5-
$listen_port = $puppetdb::params::listen_port,
6-
$disable_cleartext = $puppetdb::params::disable_cleartext,
7-
$open_listen_port = $puppetdb::params::open_listen_port,
8-
$ssl_listen_address = $puppetdb::params::ssl_listen_address,
9-
$ssl_listen_port = $puppetdb::params::ssl_listen_port,
10-
$disable_ssl = $puppetdb::params::disable_ssl,
11-
$open_ssl_listen_port = $puppetdb::params::open_ssl_listen_port,
12-
$ssl_dir = $puppetdb::params::ssl_dir,
13-
$ssl_set_cert_paths = $puppetdb::params::ssl_set_cert_paths,
14-
$ssl_cert_path = $puppetdb::params::ssl_cert_path,
15-
$ssl_key_path = $puppetdb::params::ssl_key_path,
16-
$ssl_ca_cert_path = $puppetdb::params::ssl_ca_cert_path,
17-
$ssl_deploy_certs = $puppetdb::params::ssl_deploy_certs,
18-
$ssl_key = $puppetdb::params::ssl_key,
19-
$ssl_cert = $puppetdb::params::ssl_cert,
20-
$ssl_ca_cert = $puppetdb::params::ssl_ca_cert,
21-
$ssl_protocols = $puppetdb::params::ssl_protocols,
22-
$cipher_suites = $puppetdb::params::cipher_suites,
23-
$manage_dbserver = $puppetdb::params::manage_dbserver,
24-
$manage_database = $puppetdb::params::manage_database,
25-
$manage_package_repo = $puppetdb::params::manage_pg_repo,
26-
$postgres_version = $puppetdb::params::postgres_version,
27-
$database = $puppetdb::params::database,
28-
$database_host = $puppetdb::params::database_host,
29-
$database_port = $puppetdb::params::database_port,
30-
$database_username = $puppetdb::params::database_username,
31-
$database_password = $puppetdb::params::database_password,
32-
$database_name = $puppetdb::params::database_name,
33-
$manage_db_password = $puppetdb::params::manage_db_password,
34-
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
35-
$database_listen_address = $puppetdb::params::postgres_listen_addresses,
36-
$database_validate = $puppetdb::params::database_validate,
37-
$database_embedded_path = $puppetdb::params::database_embedded_path,
38-
$node_ttl = $puppetdb::params::node_ttl,
39-
$node_purge_ttl = $puppetdb::params::node_purge_ttl,
40-
$report_ttl = $puppetdb::params::report_ttl,
41-
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
42-
$gc_interval = $puppetdb::params::gc_interval,
43-
$node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
44-
$log_slow_statements = $puppetdb::params::log_slow_statements,
45-
$conn_max_age = $puppetdb::params::conn_max_age,
46-
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
47-
$conn_lifetime = $puppetdb::params::conn_lifetime,
48-
$puppetdb_package = $puppetdb::params::puppetdb_package,
49-
$puppetdb_service = $puppetdb::params::puppetdb_service,
50-
$puppetdb_service_status = $puppetdb::params::puppetdb_service_status,
51-
$puppetdb_user = $puppetdb::params::puppetdb_user,
52-
$puppetdb_group = $puppetdb::params::puppetdb_group,
53-
$read_database = $puppetdb::params::read_database,
54-
$read_database_host = $puppetdb::params::read_database_host,
55-
$read_database_port = $puppetdb::params::read_database_port,
56-
$read_database_username = $puppetdb::params::read_database_username,
57-
$read_database_password = $puppetdb::params::read_database_password,
58-
$read_database_name = $puppetdb::params::read_database_name,
59-
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
60-
$read_database_jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
61-
$read_database_validate = $puppetdb::params::read_database_validate,
62-
$read_log_slow_statements = $puppetdb::params::read_log_slow_statements,
63-
$read_conn_max_age = $puppetdb::params::read_conn_max_age,
64-
$read_conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
65-
$read_conn_lifetime = $puppetdb::params::read_conn_lifetime,
66-
$confdir = $puppetdb::params::confdir,
67-
$vardir = $puppetdb::params::vardir,
68-
$manage_firewall = $puppetdb::params::manage_firewall,
69-
$java_args = $puppetdb::params::java_args,
70-
$merge_default_java_args = $puppetdb::params::merge_default_java_args,
71-
$max_threads = $puppetdb::params::max_threads,
72-
$command_threads = $puppetdb::params::command_threads,
73-
$concurrent_writes = $puppetdb::params::concurrent_writes,
74-
$store_usage = $puppetdb::params::store_usage,
75-
$temp_usage = $puppetdb::params::temp_usage,
76-
$disable_update_checking = $puppetdb::params::disable_update_checking,
77-
$certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file,
78-
$certificate_whitelist = $puppetdb::params::certificate_whitelist,
79-
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
80-
$read_database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
81-
Boolean $automatic_dlo_cleanup = $puppetdb::params::automatic_dlo_cleanup,
82-
String[1] $cleanup_timer_interval = $puppetdb::params::cleanup_timer_interval,
83-
Integer[1] $dlo_max_age = $puppetdb::params::dlo_max_age,
4+
$listen_address = $puppetdb::params::listen_address,
5+
$listen_port = $puppetdb::params::listen_port,
6+
$disable_cleartext = $puppetdb::params::disable_cleartext,
7+
$open_listen_port = $puppetdb::params::open_listen_port,
8+
$ssl_listen_address = $puppetdb::params::ssl_listen_address,
9+
$ssl_listen_port = $puppetdb::params::ssl_listen_port,
10+
$disable_ssl = $puppetdb::params::disable_ssl,
11+
$open_ssl_listen_port = $puppetdb::params::open_ssl_listen_port,
12+
$ssl_dir = $puppetdb::params::ssl_dir,
13+
$ssl_set_cert_paths = $puppetdb::params::ssl_set_cert_paths,
14+
$ssl_cert_path = $puppetdb::params::ssl_cert_path,
15+
$ssl_key_path = $puppetdb::params::ssl_key_path,
16+
$ssl_ca_cert_path = $puppetdb::params::ssl_ca_cert_path,
17+
$ssl_deploy_certs = $puppetdb::params::ssl_deploy_certs,
18+
$ssl_key = $puppetdb::params::ssl_key,
19+
$ssl_cert = $puppetdb::params::ssl_cert,
20+
$ssl_ca_cert = $puppetdb::params::ssl_ca_cert,
21+
$ssl_protocols = $puppetdb::params::ssl_protocols,
22+
$cipher_suites = $puppetdb::params::cipher_suites,
23+
$manage_dbserver = $puppetdb::params::manage_dbserver,
24+
$manage_database = $puppetdb::params::manage_database,
25+
$manage_package_repo = $puppetdb::params::manage_pg_repo,
26+
$postgres_version = $puppetdb::params::postgres_version,
27+
$database = $puppetdb::params::database,
28+
$database_host = $puppetdb::params::database_host,
29+
$database_port = $puppetdb::params::database_port,
30+
$database_username = $puppetdb::params::database_username,
31+
$database_password = $puppetdb::params::database_password,
32+
$database_name = $puppetdb::params::database_name,
33+
$manage_db_password = $puppetdb::params::manage_db_password,
34+
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
35+
$database_listen_address = $puppetdb::params::postgres_listen_addresses,
36+
$database_validate = $puppetdb::params::database_validate,
37+
$database_embedded_path = $puppetdb::params::database_embedded_path,
38+
$node_ttl = $puppetdb::params::node_ttl,
39+
$node_purge_ttl = $puppetdb::params::node_purge_ttl,
40+
$report_ttl = $puppetdb::params::report_ttl,
41+
Optional[Array] $facts_blacklist = $puppetdb::params::facts_blacklist,
42+
$gc_interval = $puppetdb::params::gc_interval,
43+
$node_purge_gc_batch_limit = $puppetdb::params::node_purge_gc_batch_limit,
44+
$log_slow_statements = $puppetdb::params::log_slow_statements,
45+
$conn_max_age = $puppetdb::params::conn_max_age,
46+
$conn_keep_alive = $puppetdb::params::conn_keep_alive,
47+
$conn_lifetime = $puppetdb::params::conn_lifetime,
48+
$puppetdb_package = $puppetdb::params::puppetdb_package,
49+
$puppetdb_service = $puppetdb::params::puppetdb_service,
50+
$puppetdb_service_status = $puppetdb::params::puppetdb_service_status,
51+
$puppetdb_user = $puppetdb::params::puppetdb_user,
52+
$puppetdb_group = $puppetdb::params::puppetdb_group,
53+
$read_database = $puppetdb::params::read_database,
54+
$read_database_host = $puppetdb::params::read_database_host,
55+
$read_database_port = $puppetdb::params::read_database_port,
56+
$read_database_username = $puppetdb::params::read_database_username,
57+
$read_database_password = $puppetdb::params::read_database_password,
58+
$read_database_name = $puppetdb::params::read_database_name,
59+
$manage_read_db_password = $puppetdb::params::manage_read_db_password,
60+
$read_database_jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
61+
$read_database_validate = $puppetdb::params::read_database_validate,
62+
$read_log_slow_statements = $puppetdb::params::read_log_slow_statements,
63+
$read_conn_max_age = $puppetdb::params::read_conn_max_age,
64+
$read_conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
65+
$read_conn_lifetime = $puppetdb::params::read_conn_lifetime,
66+
$confdir = $puppetdb::params::confdir,
67+
$vardir = $puppetdb::params::vardir,
68+
$manage_firewall = $puppetdb::params::manage_firewall,
69+
$java_args = $puppetdb::params::java_args,
70+
$merge_default_java_args = $puppetdb::params::merge_default_java_args,
71+
$max_threads = $puppetdb::params::max_threads,
72+
$command_threads = $puppetdb::params::command_threads,
73+
$concurrent_writes = $puppetdb::params::concurrent_writes,
74+
$store_usage = $puppetdb::params::store_usage,
75+
$temp_usage = $puppetdb::params::temp_usage,
76+
$disable_update_checking = $puppetdb::params::disable_update_checking,
77+
$certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file,
78+
$certificate_whitelist = $puppetdb::params::certificate_whitelist,
79+
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
80+
$read_database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
81+
Boolean $automatic_dlo_cleanup = $puppetdb::params::automatic_dlo_cleanup,
82+
String[1] $cleanup_timer_interval = $puppetdb::params::cleanup_timer_interval,
83+
Integer[1] $dlo_max_age = $puppetdb::params::dlo_max_age,
84+
Optional[Stdlib::Absolutepath] $java_bin = $puppetdb::params::java_bin,
8485
) inherits puppetdb::params {
8586

8687
class { '::puppetdb::server':
@@ -159,6 +160,7 @@
159160
automatic_dlo_cleanup => $automatic_dlo_cleanup,
160161
cleanup_timer_interval => $cleanup_timer_interval,
161162
dlo_max_age => $dlo_max_age,
163+
java_bin => $java_bin,
162164
}
163165

164166
if ($database == 'postgres') {

‎manifests/params.pp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,7 @@
202202
} else {
203203
$database_max_pool_size_setting_name = undef
204204
}
205+
206+
# java binary path for PuppetDB. If undef, default will be used.
207+
$java_bin = undef
205208
}

0 commit comments

Comments
 (0)