- bsc#1007599 - yast virtualization module does not work well with NM

Cleanup some whitespace issues in VirtConfig.rb - bsc#1066160 - yast2-vm lacks dependencies - bsc#1008719 - Installing hypervisor (KVM) should also install network config
yast · Nov 6, 2017 · 037cc9c · 037cc9c
1 parent ad943b0
commit 037cc9c
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 24 deletions.
diff --git a/package/yast2-vm.changes b/package/yast2-vm.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Nov  2 10:43:22 MDT 2017 - carnold@suse.com
+
+- bsc#1007599 - yast virtualization module does not work well with
+  NM
+  Cleanup some whitespace issues in VirtConfig.rb
+- bsc#1066160 - yast2-vm lacks dependencies
+- bsc#1008719 - Installing hypervisor (KVM) should also install
+  network config
+- 3.2.4
+
 -------------------------------------------------------------------
 Wed Oct 11 14:59:40 UTC 2017 - aginies@suse.com
 
@@ -7,8 +18,8 @@ Wed Oct 11 14:59:40 UTC 2017 - aginies@suse.com
 - 3.2.3
 
 -------------------------------------------------------------------
-
 Wed Jul 19 14:02:32 UTC 2017 - zgock999@gmail.com
+
 - Fix package Install problem on Tumbleweed (bsc#1040042)
 
 -------------------------------------------------------------------

diff --git a/package/yast2-vm.spec b/package/yast2-vm.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-vm
-Version:        3.2.3
+Version:        3.2.4
 Release:        0
 Group:		System/YaST
 
@@ -29,6 +29,7 @@ BuildRequires:	perl-XML-Writer update-desktop-files yast2 yast2-testsuite
 BuildRequires:  yast2-bootloader >= 3.1.35
 Requires:       yast2-bootloader >= 3.1.35
 BuildRequires:  yast2-devtools >= 3.1.10
+Requires:       yast2-network >= 3.1.108
 License:        GPL-2.0
 
 # OSRelease

diff --git a/src/modules/VirtConfig.rb b/src/modules/VirtConfig.rb
@@ -211,7 +211,7 @@ def ConfigureDom0(is_s390)
 
       progress_descriptions = []
 
-      bridge_exists = false
+      configure_bridge = true
       install_xen = false
       install_kvm = false
       widget_id = nil
@@ -406,13 +406,13 @@ def LXCDialog
 	else
           packages = ["patterns-openSUSE-xen_server"] if install_xen_server
 	end
-        packages = packages + ["xen-tools", "xen-libs", "libvirt-daemon-xen", "tigervnc", "virt-manager"] if install_xen_tools
+        packages = packages + ["xen-tools", "xen-libs", "libvirt-daemon-xen", "libvirt-daemon-config-network", "tigervnc", "virt-manager"] if install_xen_tools
 	if isTumbleweed == true
           packages = packages + ["patterns-server-kvm_server"] if install_kvm_server
 	else
           packages = packages + ["patterns-openSUSE-kvm_server"] if install_kvm_server
 	end
-        packages = packages + ["libvirt-daemon-qemu", "tigervnc", "virt-manager"] if install_kvm_tools
+        packages = packages + ["libvirt-daemon-qemu", "libvirt-daemon-config-network", "tigervnc", "virt-manager"] if install_kvm_tools
         packages = packages + ["libvirt-daemon-lxc", "libvirt-daemon-config-network"] if install_lxc
         result = Package.DoInstall(common_vm_packages + packages)
         if result == false
@@ -512,29 +512,35 @@ def LXCDialog
           bridge_path = Ops.add(Ops.add(Ops.add(@net_path, "/"), i), "/bridge")
           if Ops.greater_or_equal(SCR.Read(path(".target.dir"), bridge_path), 0)
             Builtins.y2milestone("Dom0 already has a configured bridge.")
-            bridge_exists = true
+            configure_bridge = false
             raise Break
           end
-      end
+        end
+
+        if NetworkService.is_network_manager
+          Builtins.y2milestone("NetworkManager is being used. Bridge configuration must be done manually.")
+          configure_bridge = false
+          raise Break
+        end
 
         # Popup yes/no dialog
-          if bridge_exists == false
-            if Popup.AnyQuestionRichText(
-                _("Network Bridge."),
-                _(
-                  "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
-                ),
-                45,
-                5,
-                Label.YesButton,
-                Label.NoButton,
-                :focus_yes
-              )
-              Builtins.y2milestone("Configuring default bridge for Xen or KVM...")
-              Lan.Read(:cache)
-              Lan.ProposeVirtualized
-              Lan.Write
-            end
+        if configure_bridge == true
+          if Popup.AnyQuestionRichText(
+              _("Network Bridge."),
+              _(
+                "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
+              ),
+              45,
+              5,
+              Label.YesButton,
+              Label.NoButton,
+              :focus_yes
+            )
+            Builtins.y2milestone("Configuring default bridge for Xen or KVM...")
+            Lan.Read(:cache)
+            Lan.ProposeVirtualized
+            Lan.Write
+          end
         end
       else
         # For s390, make sure /etc/zipl.conf contain switch_amode