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

Auto-merge for build 93

See merge request puppet/puppet_cd!89

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html

@@ -152,7 +152,16 @@
 54
 55
 56
-57</pre>
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -186,7 +195,7 @@ class puppet_cd::main::files (
     }
 
     if $pt_use_puppetdb == true {
-      # puppetdb.conf
+      # puppetdb
       file { $pt_puppetdb_conf_file:
         ensure  =&gt; file,
         path    =&gt; $pt_puppetdb_conf_file,
@@ -207,6 +216,15 @@ class puppet_cd::main::files (
         notify  =&gt; Service[$pt_server_service],
       }
     }
+
+    if $pt_use_puppetdb != true {
+      file { $pt_puppetdb_conf_file:
+        ensure  =&gt; absent,
+      }
+      file { $pt_routes_file:
+        ensure  =&gt; absent,
+      }
+    }
   }
 }</pre>
       </td>

manifests/main/files.pp

@@ -32,7 +32,7 @@ class puppet_cd::main::files (
     }
 
     if $pt_use_puppetdb == true {
-      # puppetdb.conf
+      # puppetdb
       file { $pt_puppetdb_conf_file:
         ensure  => file,
         path    => $pt_puppetdb_conf_file,
@@ -53,5 +53,14 @@ class puppet_cd::main::files (
         notify  => Service[$pt_server_service],
       }
     }
+
+    if $pt_use_puppetdb != true {
+      file { $pt_puppetdb_conf_file:
+        ensure  => absent,
+      }
+      file { $pt_routes_file:
+        ensure  => absent,
+      }
+    }
   }
 }