File tree Expand file tree Collapse file tree 4 files changed +32
-2
lines changed
lib/foreman_maintain/utils
test/definitions/procedures/restore Expand file tree Collapse file tree 4 files changed +32
-2
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 @@ -12,6 +12,7 @@ def run
1212 backup = ForemanMaintain ::Utils ::Backup . new ( @backup_dir )
1313 required_packages = [ ]
1414 required_packages << 'puppetserver' if backup . with_puppetserver?
15+ required_packages << 'openvox-server' if backup . with_openvoxserver?
1516 if required_packages . any?
1617 with_spinner ( 'Installing required packages' ) do
1718 ForemanMaintain . package_manager . install ( required_packages , assumeyes : true )
Original file line number Diff line number Diff line change @@ -179,6 +179,10 @@ def with_puppetserver?
179179 installed_rpms . any? { |rpm | rpm . start_with? ( 'puppetserver-' ) }
180180 end
181181
182+ def with_openvoxserver?
183+ installed_rpms . any? { |rpm | rpm . start_with? ( 'openvox-server-' ) }
184+ end
185+
182186 def source_os_version
183187 metadata . fetch ( 'os_version' , 'unknown' )
184188 end
Original file line number Diff line number Diff line change 77 Procedures ::Restore ::RequiredPackages . new ( :backup_dir => '.' )
88 end
99
10+ it 'installs openvox-server if it was in the backup' do
11+ ForemanMaintain ::Utils ::Backup . any_instance . stubs ( :with_openvoxserver? ) . returns ( true )
12+ ForemanMaintain . package_manager . expects ( :install ) .
13+ with ( [ 'openvox-server' ] , assumeyes : true ) . once
14+ result = run_procedure ( subject )
15+ assert result . success? , 'the procedure was expected to succeed'
16+ end
17+
18+ it 'doesnt install openvox-server if it wasnt in the backup' do
19+ ForemanMaintain ::Utils ::Backup . any_instance . stubs ( :with_openvoxserver? ) . returns ( false )
20+ ForemanMaintain . package_manager . expects ( :install ) .
21+ with ( [ 'openvox-server' ] , assumeyes : true ) . never
22+ result = run_procedure ( subject )
23+ assert result . success? , 'the procedure was expected to succeed'
24+ end
25+
1026 it 'installs puppetserver if it was in the backup' do
1127 ForemanMaintain ::Utils ::Backup . any_instance . stubs ( :with_puppetserver? ) . returns ( true )
1228 ForemanMaintain . package_manager . expects ( :install ) .
You can’t perform that action at this time.
0 commit comments