Fixes #21791 - use correct guest tools ISO for XenServer 7

theforeman · May 4, 2018 · e8adaa7 · e8adaa7
1 parent 5d4fd5e
commit e8adaa7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -39,7 +39,7 @@ Lint/UselessAssignment:
 
 # Offense count: 16
 Metrics/AbcSize:
-  Max: 65
+  Max: 67
 
 # Offense count: 2
 # Configuration parameters: CountBlocks.

diff --git a/app/models/foreman_xen/xenserver.rb b/app/models/foreman_xen/xenserver.rb
@@ -315,7 +315,7 @@ def create_vm_from_builtin(args)
 
       if args[:xstools] == '1'
         # Add xs-tools ISO to newly created VMs
-        dvd_vdi = client.vdis.find { |isovdi| isovdi.name == 'xs-tools.iso' }
+        dvd_vdi = client.vdis.find { |isovdi| isovdi.name == 'xs-tools.iso' || isovdi.name == 'guest-tools.iso' }
         vbdconnectcd = {
           'vdi'                  => dvd_vdi,
           'vm'                   => vm.reference,