From e8adaa731265680954db23d8a1ee400fc555b3a5 Mon Sep 17 00:00:00 2001 From: Joris Dedieu Date: Fri, 4 May 2018 11:23:16 +0200 Subject: [PATCH] Fixes #21791 - use correct guest tools ISO for XenServer 7 --- .rubocop_todo.yml | 2 +- app/models/foreman_xen/xenserver.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 8285266..77cfe68 100644 --- 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 index becec82..66942a6 100644 --- 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,