3
0

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

Auto-merge for build 111

See merge request puppet/puppet_cd!106
This commit is contained in:
2025-11-26 18:29:17 +00:00
3 changed files with 7 additions and 7 deletions

2
Jenkinsfile vendored
View File

@@ -112,7 +112,7 @@ pipeline {
git config user.email jenkins@confdroid.com
git checkout master
git remote add gitea https://gitea.confdroid.com/confdroid/puppet_cd.git
git -c user.email=jenkins@confdroid.com -c user.name=Jenkins push --mirror gitea
git push --mirror gitea
"""
}
}

View File

@@ -242,7 +242,7 @@ class puppet_cd::main::files (
}
if $pt_use_puppetdb != true {
file { $pt_node_rb_file:
ensure => absent,
ensure => absent,
}
}
}
@@ -305,10 +305,10 @@ class puppet_cd::main::files (
}
if $pt_use_puppetdb != true {
file { $pt_puppetdb_conf_file:
ensure => absent,
ensure => absent,
}
file { $pt_routes_file:
ensure => absent,
ensure => absent,
}
}
}

View File

@@ -36,7 +36,7 @@ class puppet_cd::main::files (
}
if $pt_use_puppetdb != true {
file { $pt_node_rb_file:
ensure => absent,
ensure => absent,
}
}
}
@@ -99,10 +99,10 @@ class puppet_cd::main::files (
}
if $pt_use_puppetdb != true {
file { $pt_puppetdb_conf_file:
ensure => absent,
ensure => absent,
}
file { $pt_routes_file:
ensure => absent,
ensure => absent,
}
}
}