Perry Myers
2008-Oct-14 20:32 UTC
[Ovirt-devel] [PATCH server] Fixed regression caused by cb2fad05d45bf51a7c8b7c06c9700b94024ae442
The above patch to allow iso and disk image provisioning broke
profile provisioning because it did not remove some vestigal code
from the create_vm method in task_vm.rb.
This is now fixed.
Signed-off-by: Perry Myers <pmyers at redhat.com>
---
src/task-omatic/task_vm.rb | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb
index 8398e83..02e41af 100644
--- a/src/task-omatic/task_vm.rb
+++ b/src/task-omatic/task_vm.rb
@@ -163,16 +163,9 @@ def create_vm(task)
# create cobbler system profile
begin
- if vm.provisioning and !vm.provisioning.empty?
- if vm.uses_cobbler?
- if vm.cobbler_type == Vm::PROFILE_PREFIX:
- system = Cobbler::System.new('name' => vm.uuid,
- 'profile' =>
provisioning_arr[2])
-
system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' =>
vm.vnic_mac_addr})]
- system.save
- end
- end
- end
+ # FIXME: Presently the wui handles all cobbler system creation.
+ # This should be moved out of the wui into Taskomatic. Specifically
+ # here, and in the edit_vm methods.
setVmState(vm, Vm::STATE_STOPPED)
rescue Exception => error
--
1.5.5.1
Scott Seago
2008-Oct-14 21:00 UTC
[Ovirt-devel] [PATCH server] Fixed regression caused by cb2fad05d45bf51a7c8b7c06c9700b94024ae442
Perry Myers wrote:> The above patch to allow iso and disk image provisioning broke > profile provisioning because it did not remove some vestigal code > from the create_vm method in task_vm.rb. > > This is now fixed. > > Signed-off-by: Perry Myers <pmyers at redhat.com> > --- > src/task-omatic/task_vm.rb | 13 +++---------- > 1 files changed, 3 insertions(+), 10 deletions(-) > > diff --git a/src/task-omatic/task_vm.rb b/src/task-omatic/task_vm.rb > index 8398e83..02e41af 100644 > --- a/src/task-omatic/task_vm.rb > +++ b/src/task-omatic/task_vm.rb > @@ -163,16 +163,9 @@ def create_vm(task) > > # create cobbler system profile > begin > - if vm.provisioning and !vm.provisioning.empty? > - if vm.uses_cobbler? > - if vm.cobbler_type == Vm::PROFILE_PREFIX: > - system = Cobbler::System.new('name' => vm.uuid, > - 'profile' => provisioning_arr[2]) > - system.interfaces=[Cobbler::NetworkInterface.new({'mac_address' => vm.vnic_mac_addr})] > - system.save > - end > - end > - end > + # FIXME: Presently the wui handles all cobbler system creation. > + # This should be moved out of the wui into Taskomatic. Specifically > + # here, and in the edit_vm methods. > > setVmState(vm, Vm::STATE_STOPPED) > rescue Exception => error >ACK here. this code isn't used anymore and no longer works. Scott