From cdcfca47b4f3ae05678e7593fc912ce9f6602121 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 28 Oct 2025 12:38:10 +0100 Subject: [PATCH 1/2] add rotes.yaml - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/292 --- manifests/main/files.pp | 11 +++++++++++ manifests/params.pp | 2 ++ templates/puppetdb/routes.yaml.erb | 5 +++++ 3 files changed, 18 insertions(+) create mode 100644 templates/puppetdb/routes.yaml.erb diff --git a/manifests/main/files.pp b/manifests/main/files.pp index b763eaa..6b57620 100644 --- a/manifests/main/files.pp +++ b/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], + } } } } diff --git a/manifests/params.pp b/manifests/params.pp index 47457b3..26f9bd8 100644 --- a/manifests/params.pp +++ b/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" diff --git a/templates/puppetdb/routes.yaml.erb b/templates/puppetdb/routes.yaml.erb new file mode 100644 index 0000000..00b4c37 --- /dev/null +++ b/templates/puppetdb/routes.yaml.erb @@ -0,0 +1,5 @@ +--- +master: + facts: + terminus: puppetdb + cache: yaml From 3f16a0c3ebda22502dd20cf8ac664e8e31501ac1 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 28 Oct 2025 12:39:34 +0100 Subject: [PATCH 2/2] Recommit for updates in build 91 --- .../puppet_cd_3A_3Amain_3A_3Afiles.html | 24 ++++++++++++++++++- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 6 ++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html index d2cc4a5..6a61f68 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html @@ -141,7 +141,18 @@ 43 44 45 -46 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57
# File 'manifests/main/files.pp', line 6
@@ -175,6 +186,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,
@@ -184,6 +196,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],
+      }
     }
   }
 }
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 3df8afa..f36994c 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1129,7 +1129,9 @@ 166 167 168 -169 +169 +170 +171
# File 'manifests/params.pp', line 58
@@ -1229,6 +1231,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"