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

Auto-merge for build 97

See merge request puppet/puppet_cd!93

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html

@@ -120,12 +120,7 @@
 22
 23
 24
-25
-26
-27
-28
-29
-30</pre>
+25</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -137,11 +132,6 @@ class puppet_cd::main::install (
     package { $pt_agent_pkg:
       ensure =&gt; $pt_pkg_ensure,
     }
-    if $pt_use_puppetdb == true {
-      package { $pt_puppetdb_pkg:
-        ensure =&gt; $pt_pkg_ensure,
-      }
-    }
   }
 
   if $fqdn == $pt_pm_fqdn {

manifests/main/install.pp

@@ -10,11 +10,6 @@ class puppet_cd::main::install (
     package { $pt_agent_pkg:
       ensure => $pt_pkg_ensure,
     }
-    if $pt_use_puppetdb == true {
-      package { $pt_puppetdb_pkg:
-        ensure => $pt_pkg_ensure,
-      }
-    }
   }
 
   if $fqdn == $pt_pm_fqdn {