From db13eb3b729fb57df75b410103628812800a9b52 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 30 Oct 2025 15:22:03 +0100 Subject: [PATCH] Recommit for updates in build 98 --- doc/file.README.html | 2 + doc/index.html | 2 + .../puppet_cd_3A_3Amain_3A_3Afiles.html | 56 ++++++++++++++++++- .../puppet_cd_3A_3Amain_3A_3Ainstall.html | 12 +--- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 6 +- 5 files changed, 64 insertions(+), 14 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index dba52bc..4de8ff0 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -84,6 +84,8 @@
  • manage directories

  • +

    install node.rb from the foreman for puppetdb

    +
  • manage puppet user settings (optional)

  • diff --git a/doc/index.html b/doc/index.html index 33a6883..07cf126 100644 --- a/doc/index.html +++ b/doc/index.html @@ -84,6 +84,8 @@
  • manage directories

  • +

    install node.rb from the foreman for puppetdb

    +
  • manage puppet user settings (optional)

  • 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 3d5f1f1..b46f62c 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html @@ -161,7 +161,33 @@ 63 64 65 -66 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92
    # File 'manifests/main/files.pp', line 6
    @@ -181,6 +207,23 @@ class puppet_cd::main::files (
           content => template($pt_puppet_conf_erb),
           notify  => Service[$pt_agent_service],
         }
    +    if $pt_use_puppetdb == true {
    +      file { $pt_node_rb_file:
    +        ensure  => file,
    +        owner   => 'puppet',
    +        group   => 'puppet',
    +        mode    => '0550',
    +        selrole => object_r,
    +        seltype => foreman_enc_t,
    +        seluser => system_u,
    +        content => template($pt_node_rb_erb),
    +      }
    +    }
    +    if $pt_use_puppetdb != true {
    +      file { $pt_node_rb_file:
    +        ensure  => absent,
    +      }
    +    }
       }
     
       if $fqdn == $pt_pm_fqdn {
    @@ -215,8 +258,17 @@ class puppet_cd::main::files (
             content => template($pt_routes_erb),
             notify  => Service[$pt_server_service],
           }
    +      file { $pt_node_rb_file:
    +        ensure  => file,
    +        owner   => 'puppet',
    +        group   => 'puppet',
    +        mode    => '0550',
    +        selrole => object_r,
    +        seltype => foreman_enc_t,
    +        seluser => system_u,
    +        content => template($pt_node_rb_erb),
    +      }
         }
    -
         if $pt_use_puppetdb != true {
           file { $pt_puppetdb_conf_file:
             ensure  => absent,
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
    index 5009249..7d7d0ac 100644
    --- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
    +++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
    @@ -120,12 +120,7 @@
     22
     23
     24
    -25
    -26
    -27
    -28
    -29
    -30
    +25
    # File 'manifests/main/install.pp', line 6
    @@ -137,11 +132,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 {
    diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
    index c7f666c..0ce6603 100644
    --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
    +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
    @@ -1150,7 +1150,9 @@
     170
     171
     172
    -173
    +173 +174 +175
    # File 'manifests/params.pp', line 59
    @@ -1253,6 +1255,8 @@ class puppet_cd::params (
       $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'
    +  $pt_node_rb_file                  = "${pt_puppetdir}/node.rb"
    +  $pt_node_rb_erb                   = 'puppet_cd/puppetdb/node.rb.erb'
     
     ## r10k
       $pt_r10k_file                     = "${pt_r10k_dir}/r10k.yaml"