Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop support for EoL Puppet Enterprise (pe) #107

Merged
merged 1 commit into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion data/common.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
augeas::aio_lens_dir: /opt/puppetlabs/puppet/share/augeas/lenses
augeas::pe_lens_dir: /opt/puppet/share/augeas/lenses
augeas::system_lens_dir: /usr/share/augeas/lenses
2 changes: 0 additions & 2 deletions data/os/Archlinux.yaml

This file was deleted.

1 change: 0 additions & 1 deletion data/os/FreeBSD.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
augeas::files_group: "wheel"
augeas::pe_lens_dir: /usr/local/share/augeas/lenses
augeas::system_lens_dir: /usr/local/share/augeas/lenses
4 changes: 1 addition & 3 deletions functions/lens_dir.pp
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
function augeas::lens_dir() >> String {
if $augeas::lens_dir {
$augeas::lens_dir
} elsif versioncmp($facts['puppetversion'], '4.0.0') >= 0 and 'aio_agent_version' in $facts {
} elsif 'aio_agent_version' in $facts {
$augeas::aio_lens_dir
} elsif 'is_pe' in $facts and $facts['is_pe'] {
$augeas::pe_lens_dir
} else {
$augeas::system_lens_dir
}
Expand Down
1 change: 0 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# ['purge'] - whether to purge lens directories
class augeas (
Stdlib::Absolutepath $aio_lens_dir,
Stdlib::Absolutepath $pe_lens_dir,
Stdlib::Absolutepath $system_lens_dir,
String $files_owner = 'root',
String $files_group = 'root',
Expand Down
30 changes: 0 additions & 30 deletions spec/classes/augeas_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,36 +83,6 @@
).without(:recurse)
}
end

context 'with Puppet Enterprise' do
let(:facts) do
facts.merge(is_pe: true)
end

it {
is_expected.to contain_file(lens_dir).with(
ensure: 'directory',
force: 'true',
recurse: 'true',
recurselimit: 1
)
}

it {
is_expected.to contain_file("#{lens_dir}/dist").with(
ensure: 'directory',
purge: 'false'
)
}

it {
is_expected.to contain_file("#{lens_dir}/tests").with(
ensure: 'directory',
force: 'true',
purge: 'true'
).without(:recurse)
}
end
end
end
end