Hello community, here is the log from the commit of package yast2-vm for openSUSE:Factory checked in at 2014-04-03 16:38:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-vm (Old) and /work/SRC/openSUSE:Factory/.yast2-vm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-vm" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-vm/yast2-vm.changes 2014-03-11 09:24:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-vm.new/yast2-vm.changes 2014-04-03 16:38:42.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Mar 12 15:49:26 CET 2014 - [email protected] + +- use patterns instead of packages list (SLES and openSUSE) +- add LXC +- improve GUI +- add some information about what will be installed +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-vm-3.1.4.tar.bz2 New: ---- yast2-vm-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.mxsWY6/_old 2014-04-03 16:38:42.000000000 +0200 +++ /var/tmp/diff_new_pack.mxsWY6/_new 2014-04-03 16:38:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-vm-3.1.4.tar.bz2 -> yast2-vm-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.4/package/yast2-vm.changes new/yast2-vm-3.1.5/package/yast2-vm.changes --- old/yast2-vm-3.1.4/package/yast2-vm.changes 2014-03-09 04:07:55.000000000 +0100 +++ new/yast2-vm-3.1.5/package/yast2-vm.changes 2014-03-26 11:17:01.000000000 +0100 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Mar 12 15:49:26 CET 2014 - [email protected] + +- use patterns instead of packages list (SLES and openSUSE) +- add LXC +- improve GUI +- add some information about what will be installed +- 3.1.5 + +------------------------------------------------------------------- Fri Mar 7 17:01:44 MST 2014 - [email protected] - The xend portion of the relocation server code is not applicable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.4/package/yast2-vm.spec new/yast2-vm-3.1.5/package/yast2-vm.spec --- old/yast2-vm-3.1.4/package/yast2-vm.spec 2014-03-09 04:07:55.000000000 +0100 +++ new/yast2-vm-3.1.5/package/yast2-vm.spec 2014-03-26 11:17:01.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-vm -Version: 3.1.4 +Version: 3.1.5 Release: 0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-vm-3.1.4/src/modules/VM_XEN.rb new/yast2-vm-3.1.5/src/modules/VM_XEN.rb --- old/yast2-vm-3.1.4/src/modules/VM_XEN.rb 2014-03-09 04:07:55.000000000 +0100 +++ new/yast2-vm-3.1.5/src/modules/VM_XEN.rb 2014-03-26 12:22:03.000000000 +0100 @@ -95,6 +95,15 @@ end false end + def isSLED + Builtins.y2milestone("Checking to see if this is SLED ...") + distro = OSRelease.ReleaseName + if distro.include? "SLED" + Builtins.y2milestone("Platform is %1", distro) + return true + end + false + end def isPAEKernel # check is we're running on 32 bit pae. @@ -211,42 +220,100 @@ # error popup abortmsg = _("The installation will be aborted.") - # Generate a pop dialog to allow user selection of Xen or KVM - if is_s390 == true + def Information + widgets = Frame(_("Choose Hypervisor(s) to install"), + HBox(VBox( + Label("server: all minimal system to get a running Hypervisor"), + Label("tools: configure, manage and monitor virtual machines"), + ), + ), + ) + end + def VMButtonBox + widgetB = ButtonBox( + PushButton(Id(:accept), Label.AcceptButton), + PushButton(Id(:cancel), Label.CancelButton), + ) + end + def KVMDialog + widgetKVM = Frame(_("KVM Hypervisor"), + HBox( + Left(CheckBox(Id(:kvm_server), Opt(:key_F6), "KVM server")), + Left(CheckBox(Id(:kvm_tools), Opt(:key_F7), "KVM tools")), + ), + ) + end + def LXCDialog + widgetLXC = Frame(_("libvirt LXC containers"), + HBox( + Left(CheckBox(Id(:lxc), Opt(:key_F4), "libvirt LXC daemon")), + ), + ) + end + + # Generate a pop dialog to allow user selection of Xen or KVM + if is_s390 == true + UI.OpenDialog( + VBox( + Information(), + VSpacing(1), + KVMDialog(), + LXCDialog(), + VMButtonBox(), + ), + ) + elsif isSLED == true UI.OpenDialog( - VBox( - Label(_("Select the virtualization platform to install.")), - Left(CheckBox(Id(:xen), Opt(:disabled), "Xen")), - Left(CheckBox(Id(:kvm), "KVM")), - ButtonBox( - PushButton(Id(:accept), Label.AcceptButton), - PushButton(Id(:cancel), Label.CancelButton) - ) - ) - ) + VBox( + VSpacing(1), + Frame(_("Software to connect to Virtualization server"), + HBox( + Left(CheckBox(Id(:client_tools), "Virtualization client tools") + ), + ), + ), + LXCDialog(), + VMButtonBox(), + ), + ) else UI.OpenDialog( - VBox( - Label(_("Select the virtualization platform to install.")), - Left(CheckBox(Id(:xen), "Xen")), - Left(CheckBox(Id(:kvm), "KVM")), - ButtonBox( - PushButton(Id(:accept), Label.AcceptButton), - PushButton(Id(:cancel), Label.CancelButton) - ) - ) - ) + VBox( + Information(), + VSpacing(1), + Frame(_("Xen Hypervisor"), + HBox( + Left(CheckBox(Id(:xen_server), Opt(:key_F8), "Xen server")), + Left(CheckBox(Id(:xen_tools), Opt(:key_F9), "Xen tools")), + ), + ), + KVMDialog(), + LXCDialog(), + VMButtonBox(), + ), + ) end widget_id = UI.UserInput if widget_id == :accept - install_xen = Convert.to_boolean(UI.QueryWidget(Id(:xen), :Value)) - install_kvm = Convert.to_boolean(UI.QueryWidget(Id(:kvm), :Value)) + install_xen_server = UI.QueryWidget(Id(:xen_server), :Value) + install_xen_tools = UI.QueryWidget(Id(:xen_tools), :Value) + install_kvm_server = UI.QueryWidget(Id(:kvm_server), :Value) + install_kvm_tools = UI.QueryWidget(Id(:kvm_tools), :Value) + install_client_tools = UI.QueryWidget(Id(:client_tools), :Value) + install_lxc = UI.QueryWidget(Id(:lxc), :Value) end UI.CloseDialog - if widget_id == :cancel || install_xen == false && install_kvm == false + install_vm = false + install_vm = true if install_xen_server + install_vm = true if install_xen_tools + install_vm = true if install_kvm_server + install_vm = true if install_kvm_tools + install_vm = true if install_client_tools + + if widget_id == :cancel || !install_vm && !install_lxc Builtins.y2milestone( "VM_XEN::ConfigureDom0 Cancel Selected or no platform selected." ) @@ -272,19 +339,31 @@ # package stage Progress.NextStage - # Common packages to both Xen and KVM - packages = ["libvirt-python", "vm-install"] + if install_vm == true + common_vm_packages = ["libvirt-client"] + # SLED doesn't have any installation capabilities (L3 support) + if isSLED == false + common_vm_packages = common_vm_packages + ["vm-install", "virt-install", "bridge-utils"] + end + end - if install_xen - packages = Builtins.add(packages, "libvirt-daemon-xen") - packages = Builtins.add(packages, "xen") - packages = Builtins.add(packages, "xen-libs") - packages = Builtins.add(packages, "xen-tools") - packages = Builtins.add(packages, "kernel-xen") - end - if install_kvm - packages = Builtins.add(packages, "libvirt-daemon-qemu") - packages = Builtins.add(packages, "qemu-kvm") + if isOpenSuse == true + packages = ["patterns-openSUSE-xen_server"] if install_xen_server + packages = packages + ["xen-tools xen-libs libvirt-daemon-xen tigervnc"] if install_xen_tools + packages = packages + ["patterns-openSUSE-kvm_server"] if install_kvm_server + packages = packages + ["libvirt-daemon-qemu tigervnc"] if install_kvm_tools + packages = packages + ["libvirt-daemon-lxc pm-utils"] if install_lxc + Package.DoInstall(common_vm_packages + packages ) + else + Package.DoInstall(["libvirt-daemon-lxc pm-utils"]) if install_lxc + if isSLED == true + Package.DoInstall(["pattern-sled-virtualization_client"]) if install_client_tools + else + Package.DoInstall(["patterns-sles-xen_server"]) if install_xen_server + Package.DoInstall(["patterns-sles-xen_tools"]) if install_xen_tools + Package.DoInstall(["patterns-sles-kvm_server"]) if install_kvm_server + Package.DoInstall(["patterns-sles-kvm_tools"]) if install_kvm_tools + end end inst_gui = true -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
