[Ovirt-devel] Re: [Fwd: [PATCH] fixed vm cobbler provisioning]
Scott Seago
sseago at redhat.com
Fri Sep 26 19:47:26 UTC 2008
Mohammed Morsi wrote:
>
> ------------------------------------------------------------------------
>
> Subject:
> [PATCH] fixed vm cobbler provisioning
> From:
> Mohammed Morsi <mmorsi at redhat.com>
> Date:
> Wed, 24 Sep 2008 21:09:35 -0400
> To:
> ovirt-devel at redhat.com
>
> To:
> ovirt-devel at redhat.com
> CC:
> Mohammed Morsi <mmorsi at redhat.com>
>
>
> ---
> src/app/controllers/vm_controller.rb | 14 ++++++++------
> 1 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/src/app/controllers/vm_controller.rb b/src/app/controllers/vm_controller.rb
> index b6192e2..f5c0845 100644
> --- a/src/app/controllers/vm_controller.rb
> +++ b/src/app/controllers/vm_controller.rb
> @@ -54,7 +54,6 @@ class VmController < ApplicationController
> :state => Task::STATE_QUEUED})
> @task.save!
> end
> - _setup_vm_provision(params)
> start_now = params[:start_now]
> if (start_now)
> if @vm.get_action_list.include?(VmTask::ACTION_START_VM)
> @@ -227,9 +226,10 @@ class VmController < ApplicationController
> # FIXME add cobbler images too
> begin
> @provisioning_options += Cobbler::Profile.find.collect do |profile|
> - [profile.name + Vm::COBBLER_PROFILE_SUFFIX, profile.name]
> -
> - end
> + [profile.name + Vm::COBBLER_PROFILE_SUFFIX,
> + Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
> + Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER + profile.name]
> + end
> rescue
> #if cobbler doesn't respond/is misconfigured/etc just don't add profiles
> end
> @@ -238,8 +238,10 @@ class VmController < ApplicationController
> # FIXME: move this to an edit_vm task in taskomatic
> def _setup_vm_provision(params)
> # spaces are invalid in the cobbler name
> - name = params[:vm][:description].gsub(" ", "-")
> - provision = params[:vm][:provisioning_and_boot_settings]
> + name = params[:vm][:uuid]
> + provision = params[:vm][:provisioning_and_boot_settings].gsub(
> + Vm::COBBLER_PREFIX + Vm::PROVISIONING_DELIMITER +
> + Vm::PROFILE_PREFIX + Vm::PROVISIONING_DELIMITER, "")
> mac = params[:vm][:vnic_mac_addr]
> unless provision == Vm::PXE_OPTION_VALUE or
> provision == Vm::HD_OPTION_VALUE
>
Works for me.
ACK
Scott
More information about the ovirt-devel
mailing list