Remove legacy /etc/encapic config (#572)
encapic v0.5.0 drops the RPM-owned /etc/encapic/encapic.conf and the binary fallback to it; config lives in /etc/encapi. Upgraded masters can be left with an empty /etc/encapic or a .rpmsave. - profiles::puppet::encapic removes /etc/encapic recursively after Package[encapic] - puppet masters pin encapic 0.5.0 Requires encapic v0.5.0 released. Reviewed-on: #572 Co-authored-by: unkin-agent <unkin-agent@unkin.net> Co-committed-by: unkin-agent <unkin-agent@unkin.net>
This commit was merged in pull request #572.
This commit is contained in:
@@ -31,7 +31,7 @@ profiles::puppet::enc::repo: https://git.service.au-syd1.consul/unkinben/puppet-
|
||||
# Deep-merged with the entries in roles/infra/puppet.yaml.
|
||||
profiles::packages::include:
|
||||
encapic:
|
||||
ensure: '0.4.0'
|
||||
ensure: '0.5.0'
|
||||
certmanager:
|
||||
ensure: '0.2.0'
|
||||
sshsignhost:
|
||||
|
||||
@@ -11,7 +11,6 @@ class profiles::puppet::encapic (
|
||||
String $group = 'root',
|
||||
) {
|
||||
|
||||
# encapic >= 0.4.0 reads this path ahead of the RPM-owned /etc/encapic one;
|
||||
# order after the package so the shim exists before the config does.
|
||||
file { $config_dir:
|
||||
ensure => directory,
|
||||
@@ -29,4 +28,11 @@ class profiles::puppet::encapic (
|
||||
content => "ENCAPI_URL=${encapi_url}\n",
|
||||
require => File[$config_dir],
|
||||
}
|
||||
|
||||
# legacy pre-0.5.0 config dir; also clears any rpm .rpmsave left behind
|
||||
file { '/etc/encapic':
|
||||
ensure => absent,
|
||||
force => true,
|
||||
require => Package['encapic'],
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user