Merge branch 'jenkins-build-81' into 'master'

Auto-merge for build 81

See merge request puppet/puppet_cd!77

doc/puppet_classes/puppet_cd_3A_3Aparams.html

@@ -168,7 +168,7 @@
   
     <li>
       
-        <span class='name'>pt_db_fqdn</span>
+        <span class='name'>pt_puppetdb_fqdn</span>
       
       
         <span class='type'>(<tt>String</tt>)</span>
@@ -1106,7 +1106,7 @@ class puppet_cd::params (
 
   Boolean $pt_manage_fw             = true,
   String $pt_pm_fqdn                = &#39;puppetmaster.example.net&#39;,
-  String $pt_db_fqdn                = &#39;puppetdb.example.net&#39;,
+  String $pt_puppetdb_fqdn          = &#39;puppetdb.example.net&#39;,
   Boolean $pt_use_puppetdb          = false,
 
   # installation

manifests/params.pp

@@ -6,7 +6,7 @@
 # @param [Boolean] pt_use_puppetdb whether to use puppetdb
 # @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 node.
+# @param [String] pt_puppetdb_fqdn the fqdn for the puppetdb node.
 # @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
@@ -58,7 +58,7 @@ class puppet_cd::params (
 
   Boolean $pt_manage_fw             = true,
   String $pt_pm_fqdn                = 'puppetmaster.example.net',
-  String $pt_db_fqdn                = 'puppetdb.example.net',
+  String $pt_puppetdb_fqdn          = 'puppetdb.example.net',
   Boolean $pt_use_puppetdb          = false,
 
   # installation

templates/puppetdb/puppetdb.conf.erb

@@ -4,5 +4,5 @@
 ##########          puppetdb.conf managed by puppet agent            ##########
 ###############################################################################
 [main]
-server_urls         = https://<%= @pt_db_fqdn%>:<%= @pt_ssl_port %>
+server_urls         = https://<%= @pt_puppetdb_fqdn %>:<%= @pt_ssl_port %>
 soft_write_failure  = <%= @pt_soft_write_failure %>