Skip to content

Commit

Permalink
Merge branch 'master' into add_subnet_domain
Browse files Browse the repository at this point in the history
  • Loading branch information
rjemanuele authored May 23, 2022
2 parents d7b86b2 + 10bcb5c commit e4b539e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
6 changes: 6 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -343,4 +343,10 @@

contain 'foreman::settings' # lint:ignore:relative_classname_inclusion (PUP-1597)
Class['foreman::database'] -> Class['foreman::settings']

file { '/usr/share/foreman/tmp/restart_required_changed_plugins':
ensure => absent,
notify => Class['foreman::service'],
require => Class['foreman::install'],
}
}
3 changes: 3 additions & 0 deletions spec/classes/foreman_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@

# settings
it { should contain_class('foreman::settings').that_requires('Class[foreman::database]') }

# restart service when new plugins are installed
it { should contain_file('/usr/share/foreman/tmp/restart_required_changed_plugins').that_requires('Class[foreman::install]').that_notifies('Class[foreman::service]') }
end

context 'without apache' do
Expand Down

0 comments on commit e4b539e

Please sign in to comment.