Fixes #39628 - Drop non-AIO paths from provisioning templates - #11163
Fixes #39628 - Drop non-AIO paths from provisioning templates#11163adamruzicka wants to merge 3 commits into
Conversation
| os_name = @host.operatingsystem.name | ||
|
|
||
| aio_enabled = host_param_true?('enable-puppetlabs-repo') || host_param_true?('enable-official-puppet8-repo') || host_param_true?('enable-puppet8') || host_param_true?('enable-official-puppet7-repo') || host_param_true?('enable-puppet7') || host_param_true?('enable-puppetlabs-puppet6-repo') || host_param_true?('enable-puppet6') || host_param_true?('enable-puppetlabs-puppet5-repo') || host_param_true?('enable-puppet5') | ||
| aio_available = os_family == 'Debian' || os_family == 'Redhat' || os_family == 'Suse' |
There was a problem hiding this comment.
note: aio_available is slightly confusing in this context. The FreeBSD package is technically AIO and I'd expect the windows one is as well.
Edit: the freebsd package is not aio, it does rely on ruby coming from the system
There was a problem hiding this comment.
I'd be tempted to remove this completely, it shouldn't need setting
There was a problem hiding this comment.
Debian has non-AIO paths in https://packages.debian.org/trixie/puppet-agent but OpenVox's puppet-agent package does use AIO paths. It's a bit confusing.
Also, I'm a bit behind on updating https://src.fedoraproject.org/rpms/puppet and migrating it to OpenVox.
5dbf9fa to
1347f6b
Compare
1347f6b to
0223730
Compare
| fi | ||
|
|
||
| cat > /etc/puppet/puppet.conf << EOF | ||
| cat > /etc/puppetlabs/puppet/puppet.conf << EOF |
There was a problem hiding this comment.
This was wrong before. This is wrong even now, but in a different way.
There was a problem hiding this comment.
Right, due to how the snapshots are build, this seems to run against a centos 7 fake host.
652b4be to
23ecb66
Compare
All supported Puppet versions use AIO packaging, making the aio_enabled check redundant.
All supported platforms (including Windows and FreeBSD) use AIO packages with their own default paths, making the vardir/logdir/ rundir/ssldir overrides unnecessary.
23ecb66 to
30573b6
Compare
2 participants
All supported Puppet versions use AIO packaging, making the aio_enabled check redundant.