File tree Expand file tree Collapse file tree 2 files changed +12
-3
lines changed
lib/foreman_maintain/utils Expand file tree Collapse file tree 2 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
33 label :puppet_server
44
55 confine do
6- find_package ( 'puppet-server' ) || find_package ( 'puppetserver' ) || find_package ( 'puppet' )
6+ find_package ( 'puppet-server' ) ||
7+ find_package ( 'openvox-server' ) ||
8+ find_package ( 'puppetserver' ) ||
9+ find_package ( 'puppet' )
710 end
811 end
912
@@ -23,7 +26,13 @@ def services
2326 # We only check puppetserver and not puppet-server, as puppet-server
2427 # is a part of httpd and relies on httpd service to restart, therefore
2528 # not requiring a separate service to restart
26- find_package ( 'puppetserver' ) ? [ system_service ( 'puppetserver' , 30 ) ] : [ ]
29+ return [ system_service ( 'puppetserver' , 30 ) ] if find_package ( 'puppetserver' ) ||
30+ find_package ( 'openvox-server' )
31+ [ ]
32+ end
33+
34+ def openvox?
35+ find_package ( 'openvox-server' )
2736 end
2837
2938 def find_empty_cacert_request_files
Original file line number Diff line number Diff line change @@ -176,7 +176,7 @@ def installed_rpms
176176 end
177177
178178 def with_puppetserver?
179- installed_rpms . any? { |rpm | rpm . start_with? ( 'puppetserver-' ) }
179+ installed_rpms . any? { |rpm | rpm ~ = /^(openvox-|puppet)server-/ }
180180 end
181181
182182 def source_os_version
You can’t perform that action at this time.
0 commit comments