feat: migrate puppet-agent to openvox
- change from puppet-agent to openvox-agent - upgrade version from 7.34 to 7.36
This commit is contained in:
@@ -1,37 +1,48 @@
|
||||
# profiles::puppet::agent
|
||||
# This class manages Puppet agent package and service.
|
||||
class profiles::puppet::agent (
|
||||
String $puppet_version = 'latest',
|
||||
String $version = 'latest',
|
||||
Boolean $openvox_enable = false,
|
||||
) {
|
||||
|
||||
# if puppet-version is anything other than latest, set a versionlock
|
||||
$puppet_versionlock_ensure = $puppet_version ? {
|
||||
if $openvox_enable {
|
||||
$use_package = 'openvox-agent'
|
||||
$use_yumrepo = 'openvox'
|
||||
$use_service = 'puppet'
|
||||
}else{
|
||||
$use_package = 'puppet-agent'
|
||||
$use_yumrepo = 'puppet'
|
||||
$use_service = 'puppet'
|
||||
}
|
||||
|
||||
# if agent-version is anything other than latest, set a versionlock
|
||||
$agent_versionlock_ensure = $version ? {
|
||||
'latest' => 'absent',
|
||||
default => 'present',
|
||||
}
|
||||
$puppet_versionlock_version = $puppet_version ? {
|
||||
$agent_versionlock_version = $version ? {
|
||||
'latest' => undef,
|
||||
default => $puppet_version,
|
||||
default => $version,
|
||||
}
|
||||
|
||||
case $facts['os']['family'] {
|
||||
'RedHat': {
|
||||
# Ensure the puppet-agent package is installed and locked to a specific version
|
||||
package { 'puppet-agent':
|
||||
ensure => $puppet_version,
|
||||
require => Yumrepo['puppet'],
|
||||
# Ensure the agent package is installed and locked to a specific version
|
||||
package { $use_package:
|
||||
ensure => $version,
|
||||
require => Yumrepo[$use_yumrepo],
|
||||
}
|
||||
|
||||
# versionlock puppet-agent
|
||||
yum::versionlock{'puppet-agent':
|
||||
ensure => $puppet_versionlock_ensure,
|
||||
version => $puppet_versionlock_version,
|
||||
yum::versionlock{$use_package:
|
||||
ensure => $agent_versionlock_ensure,
|
||||
version => $agent_versionlock_version,
|
||||
}
|
||||
}
|
||||
'Debian': {
|
||||
# Ensure the puppet-agent package is installed and locked to a specific version
|
||||
package { 'puppet-agent':
|
||||
ensure => $puppet_version,
|
||||
package { $use_package:
|
||||
ensure => $version,
|
||||
require => Class['profiles::apt::puppet7'],
|
||||
}
|
||||
}
|
||||
@@ -39,12 +50,11 @@ class profiles::puppet::agent (
|
||||
}
|
||||
|
||||
# Ensure the puppet service is running
|
||||
service { 'puppet':
|
||||
service { $use_service:
|
||||
ensure => 'running',
|
||||
enable => true,
|
||||
hasrestart => true,
|
||||
require => Package['puppet-agent'],
|
||||
require => Package[$use_package],
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -13,11 +13,17 @@ class profiles::puppet::client (
|
||||
Boolean $show_diff = true,
|
||||
Boolean $usecacheonfailure = false,
|
||||
Integer $facts_soft_limit = 4096,
|
||||
Boolean $openvox_enable = false,
|
||||
) {
|
||||
|
||||
# dont manage puppet.conf if this is a puppetmaster
|
||||
if $facts['enc_role'] != 'roles::infra::puppet::master' {
|
||||
|
||||
if $openvox_enable {
|
||||
$use_service = 'puppet'
|
||||
}else{
|
||||
$use_service = 'puppet'
|
||||
}
|
||||
|
||||
$dns_alt_names_string = join(sort($dns_alt_names), ',')
|
||||
|
||||
@@ -28,14 +34,14 @@ class profiles::puppet::client (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
notify => Service['puppet'],
|
||||
notify => Service[$use_service],
|
||||
}
|
||||
|
||||
package { 'toml_puppetagent_gem':
|
||||
ensure => installed,
|
||||
name => 'toml',
|
||||
provider => 'puppet_gem',
|
||||
notify => Service['puppet'],
|
||||
notify => Service[$use_service],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user