Skip to content

Commit a83a45c

Browse files
sbernhardstejskalleos
authored andcommitted
Use: Rebuild only if host powered off
Use theforeman/foreman#10860 and refactor the vsphere/proxmox methods as it is no longer needed to start/stop/reboot
1 parent ed65dc6 commit a83a45c

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

app/models/concerns/foreman_bootdisk/compute_resources/proxmox.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def iso_attach(iso, vm_uuid)
2727
disks = server.disks.map { |disk| disk.split(":")[0] }.join(";")
2828
server.update({ ide2: "#{volume.volid},media=cdrom" })
2929
server.update({ boot: "order=ide2;#{disks}" })
30-
server.reboot
3130
end
3231

3332
def iso_detach(vm_uuid)

app/models/concerns/foreman_bootdisk/compute_resources/vmware.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ def iso_attach(iso, vm_uuid)
4242
'allow_guest_control' => true,
4343
'controller_key' => controller[:key]
4444
}
45-
vm = find_vm_by_uuid(vm_uuid)
46-
vm.stop if vm.ready?
47-
vm.reload
4845
client.vm_reconfig_cdrom options
49-
vm.start if !vm.ready?
5046
end
5147

5248
def iso_detach(vm_uuid)

app/models/concerns/foreman_bootdisk/host_ext.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ def bootdisk_downloadable?
3131
architecture.blank? || intel_arch?
3232
end
3333

34+
def bootdisk_rebuild_requires_poweroff
35+
true
36+
end
37+
3438
def intel_arch?
3539
/i.86|x86[_-]64/ =~ architecture.name
3640
end

0 commit comments

Comments
 (0)