# File 'manifests/main/install.pp', line 6
@@ -136,12 +130,6 @@ class puppet_cd::main::install (
ensure => $pt_pkg_ensure,
}
}
-
- if $fqdn == $pt_db_fqdn {
- package { $pt_db_pkg:
- ensure => $pt_pkg_ensure,
- }
- }
}
the fqdn for the puppetdb host.
-non-ssl port number for puppetdb
-ssl port for puppetdb
-whether to use ssl only.
-whether to manage the user for puppetdb
-the puppetdb user
-the user comment for puppetdb user
-the user home for the puppetdb user
-the shell for the puppetdb user
-whether to use puppetdb on host
-max file size for puppetdb logging
-max logging history
-total size of logging file
-number of processing threads
-max concurrent writes
-the db name
-the db username
-the db password
-garbage collection interval (Java)
-number of seconds before an SQL query is considered “slow.”
-the source lan for puppetdb clients
-allows the PuppetDB-termini to fail softly if PuppetDB is not accessible for command submission.
-ip range for non-ssl hosts
-ip range for SSL hosts
-location of the private key
-location of the ssl cert
-location of the ssl ca cert
-whether to configure log access
-the location of the access log config
-whether to allow puppetdb replication
-the replication port
-the replication host
-+55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 89 90 91 @@ -1531,45 +1053,10 @@ 156 157 158 -159 -160 -161 -162 -163 -164 -165 -166 -167 -168 -169 -170 -171 -172 -173 -174 -175 -176 -177 -178 -179 -180 -181 -182 -183 -184 -185 -186 -187 -188 -189 -190 -191 -192 -193 -194+159
# File 'manifests/params.pp', line 89
+ # File 'manifests/params.pp', line 55
class puppet_cd::params (
@@ -1580,8 +1067,7 @@ class puppet_cd::params (
String $pt_pkg_ensure = 'latest',
String $pt_agent_pkg = 'puppet-agent',
String $pt_server_pkg = 'puppetserver',
- Array $pt_db_pkg = ['puppetdb','puppetdb-termini'],
- Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'],
+ Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'],
Array $pt_r10k_webhook_pkg = ['webrick', 'r10k_gitlab_webhook'],
# user settings
diff --git a/manifests/main/install.pp b/manifests/main/install.pp
index 111e937..c33c4d2 100644
--- a/manifests/main/install.pp
+++ b/manifests/main/install.pp
@@ -15,5 +15,4 @@ class puppet_cd::main::install (
ensure => $pt_pkg_ensure,
}
}
- }
}
diff --git a/manifests/params.pp b/manifests/params.pp
index 41743ed..8ff76dd 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,25 +5,15 @@
# @param [Boolean] pt_manage_fw whether to manage firewall settings
# @param [String] pt_pm_fqdn the fqdn for the puppetmaster and master
# settings are applied. any other fqdn # will be considered a puppet agent.
-# @param [String] pt_db_fqdn the fqdn for the puppetdb host.
# @param [String] pt_pkg_ensure valid: "present", "latest", "v1.2.3"
# @param [String] pt_agent_pkg the packages for agents to install
# @param [String] pt_server_pkg the server packages to install
# @param [Array] pt_db_pkg the packages for puppetdb
# @param [Array] pt_r10k_pkg the packages for r10k to install
-# @param [String] pt_no_ssl_port non-ssl port number for puppetdb
-# @param [String] pt_ssl_port ssl port for puppetdb
-# @param [Boolean] pt_use_ssl_only whether to use ssl only.
# @param [String] pt_user the puppet user
# @param [String] pt_user_comment the user comment
# @param [String] pt_user_home the user home
# @param [String] pt_user_shell the user shell
-# @param [Boolean] pt_manage_db_user whether to manage the user for puppetdb
-# @param [String] pt_db_user the puppetdb user
-# @param [String] pt_db_user_comment the user comment for puppetdb user
-# @param [String] pt_db_user_home the user home for the puppetdb user
-# @param [String] pt_db_user_shell the shell for the puppetdb user
-# @param [Boolean] pt_use_puppetdb whether to use puppetdb on host
# @param [String] pt_environment the environment
# @param [Boolean] pt_basemodulepath the base module path
# @param [String] pt_logdir the log directory
@@ -53,30 +43,6 @@
# @param [String] pt_storeconfigs_backend where to store client configs
# @param [String] pt_parser which parser version to use
# @param [Boolean] pt_cert_revocation whether to check for cert revocations
-# @param [String] pt_logging_max_file_size max file size for puppetdb logging
-# @param [String] pt_logging_max_history max logging history
-# @param [String] pt_logging_total_size total size of logging file
-# @param [String] pt_com_proc_threads number of processing threads
-# @param [String] pt_concurrent_writes max concurrent writes
-# @param [String] pt_db_subname the db name
-# @param [String] pt_db_username the db username
-# @param [String] pt_db_password the db password
-# @param [String] pt_gc_interval garbage collection interval (Java)
-# @param [String] pt_log_slow_statements number of seconds before an SQL query
-# is considered "slow."
-# @param [String] pt_puppetdb_source_lan the source lan for puppetdb clients
-# @param [Boolean] pt_soft_write_failure allows the PuppetDB-termini to fail
-# softly if PuppetDB is not accessible for command submission.
-# @param [String] pt_no_ssl_host ip range for non-ssl hosts
-# @param [String] pt_ssl_host ip range for SSL hosts
-# @param [String] pt_ssl_key location of the private key
-# @param [String] pt_ssl_cert location of the ssl cert
-# @param [String] pt_ssl_ca_cert location of the ssl ca cert
-# @param [Boolean] pt_log_access whether to configure log access
-# @param [String] pt_access_log_config the location of the access log config
-# @param [Boolean] pt_enable_repl whether to allow puppetdb replication
-# @param [String] pt_repl_port the replication port
-# @param [String] pt_repl_host the replication host
# @param [Boolean] pt_use_r10k whether to use r10k service
# @param [Boolean] pt_use_r10k_webhook whether to use r10k webhook service
# @param [String] pt_r10k_remote the remote url for the r10k control repo
@@ -95,8 +61,7 @@ class puppet_cd::params (
String $pt_pkg_ensure = 'latest',
String $pt_agent_pkg = 'puppet-agent',
String $pt_server_pkg = 'puppetserver',
- Array $pt_db_pkg = ['puppetdb','puppetdb-termini'],
- Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'],
+ Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'],
Array $pt_r10k_webhook_pkg = ['webrick', 'r10k_gitlab_webhook'],
# user settings