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

Auto-merge for build 91

See merge request puppet/puppet_cd!87

doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html

@@ -141,7 +141,18 @@
 43
 44
 45
-46</pre>
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -175,6 +186,7 @@ class puppet_cd::main::files (
     }
 
     if $pt_use_puppetdb == true {
+      # puppetdb.conf
       file { $pt_puppetdb_conf_file:
         ensure  =&gt; file,
         path    =&gt; $pt_puppetdb_conf_file,
@@ -184,6 +196,16 @@ class puppet_cd::main::files (
         content =&gt; template($pt_puppetdb_conf_erb),
         notify  =&gt; Service[$pt_agent_service,$pt_server_service],
       }
+      # routes.yaml
+      file { $pt_routes_file:
+        ensure  =&gt; file,
+        path    =&gt; $pt_routes_file,
+        owner   =&gt; &#39;root&#39;,
+        group   =&gt; &#39;root&#39;,
+        mode    =&gt; &#39;0644&#39;,
+        content =&gt; template($pt_routes_erb),
+        notify  =&gt; Service[$pt_server_service],
+      }
     }
   }
 }</pre>

doc/puppet_classes/puppet_cd_3A_3Aparams.html

@@ -1129,7 +1129,9 @@
 166
 167
 168
-169</pre>
+169
+170
+171</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 58</span>
@@ -1229,6 +1231,8 @@ class puppet_cd::params (
   $pt_hiera_config                  = &quot;${pt_puppetdir}/hiera.yaml&quot;
   $pt_puppetdb_conf_file            = &quot;${pt_puppetdir}/puppetdb.conf&quot;
   $pt_puppetdb_conf_erb             = &#39;puppet_cd/puppetdb/puppetdb.conf.erb&#39;
+  $pt_routes_file                   = &quot;${pt_puppetdir}/routes.yaml&quot;
+  $pt_routes_erb                    = &#39;puppet_cd/puppetdb/routes.yaml.erb&#39;
 
 ## r10k
   $pt_r10k_file                     = &quot;${pt_r10k_dir}/r10k.yaml&quot;

manifests/main/files.pp

@@ -32,6 +32,7 @@ class puppet_cd::main::files (
     }
 
     if $pt_use_puppetdb == true {
+      # puppetdb.conf
       file { $pt_puppetdb_conf_file:
         ensure  => file,
         path    => $pt_puppetdb_conf_file,
@@ -41,6 +42,16 @@ class puppet_cd::main::files (
         content => template($pt_puppetdb_conf_erb),
         notify  => Service[$pt_agent_service,$pt_server_service],
       }
+      # routes.yaml
+      file { $pt_routes_file:
+        ensure  => file,
+        path    => $pt_routes_file,
+        owner   => 'root',
+        group   => 'root',
+        mode    => '0644',
+        content => template($pt_routes_erb),
+        notify  => Service[$pt_server_service],
+      }
     }
   }
 }

manifests/params.pp

@@ -150,6 +150,8 @@ class puppet_cd::params (
   $pt_hiera_config                  = "${pt_puppetdir}/hiera.yaml"
   $pt_puppetdb_conf_file            = "${pt_puppetdir}/puppetdb.conf"
   $pt_puppetdb_conf_erb             = 'puppet_cd/puppetdb/puppetdb.conf.erb'
+  $pt_routes_file                   = "${pt_puppetdir}/routes.yaml"
+  $pt_routes_erb                    = 'puppet_cd/puppetdb/routes.yaml.erb'
 
 ## r10k
   $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"

templates/puppetdb/routes.yaml.erb

@@ -0,0 +1,5 @@
+---
+master:
+  facts:
+    terminus: puppetdb
+    cache: yaml