diff --git a/manifests/params.pp b/manifests/params.pp index db8cae8..4f16ead 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -24,6 +24,7 @@ # @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 ############################################################################### class puppet_cd::params ( @@ -38,6 +39,7 @@ class puppet_cd::params ( String $pt_server_pkg = 'puppetserver', Array $pt_db_pkg = ['puppetdb','puppetdb-termini'], # puppetdb + Boolean $pt_use_puppetdb = false, String $pt_no_ssl_port = '8080', String $pt_ssl_port = '8081', Boolean $pt_use_ssl_only = true, diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb index 9b5a35e..0aaf4d8 100644 --- a/templates/puppet.conf.erb +++ b/templates/puppet.conf.erb @@ -2,9 +2,11 @@ ########## puppet.conf generated by puppet ########### ############################################################################### -#<% if @fqdn == @pt_pm_fqdn -%> +<% if @fqdn == @pt_pm_fqdn -%> -#<% end end -%> -#<% if @fqdn != @pt_pm_fqdn -%> +<% if @pt_use_puppetdb == true %> -#<% end end -%> \ No newline at end of file +<% end end -%> +<% if @fqdn != @pt_pm_fqdn -%> + +<% end -%> \ No newline at end of file