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.

Sign up for GitHub

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

Jump to bottom

Remove general yumrepo ordering and fix ordering for acceptance tests only #53

Merged
merged 2 commits into from
Sep 25, 2024
Merged

Remove general yumrepo ordering and fix ordering for acceptance tests only #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
329af79
Revert "fix acceptance tests on Rocky/RHEL 8"
cruelsmith Sep 24, 2024
82673af
ensure needed order for RedHat acceptance tests
cruelsmith Sep 24, 2024
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
7 changes: 4 additions & 3 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,10 @@
Optional[Stdlib::Filesource] $authgroupfile_source = undef,
Optional[Stdlib::Absolutepath] $prefix = undef,
) {
class { 'proftpd::install': }
-> class { 'proftpd::config': }
~> class { 'proftpd::service': }
contain proftpd::install
contain proftpd::config
contain proftpd::service
Class['proftpd::install'] -> Class['proftpd::config'] ~> Class['proftpd::service']

if $load_modules {
create_resources(proftpd::module, $load_modules, {})
Expand Down
4 changes: 0 additions & 4 deletions manifests/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
class proftpd::install {
assert_private()

if $facts['os']['family'] == 'RedHat' {
Yumrepo <| |> -> Package <| |>
}

if $proftpd::package_manage {
package { $proftpd::packages:
ensure => $proftpd::package_ensure,
Expand Down
1 change: 1 addition & 0 deletions spec/acceptance/proftpd_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
pp = <<-EOS
if $facts['os']['family'] == 'RedHat' {
include epel
Class['epel'] -> Class['proftpd']
}
class { 'proftpd': }
EOS
Expand Down