mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 18:55:27 -06:00
engine: Move the first run systemd handling to connectauth.py
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
parent
64e3ff1d08
commit
7769d9a1e4
@ -4,10 +4,8 @@
|
||||
# This work is licensed under the GNU GPLv2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
import os
|
||||
import queue
|
||||
import threading
|
||||
import time
|
||||
|
||||
from gi.repository import Gio
|
||||
from gi.repository import GLib
|
||||
@ -131,89 +129,17 @@ class vmmEngine(vmmGObject):
|
||||
line, try to determine a default URI and open it, first checking
|
||||
if libvirt is running
|
||||
"""
|
||||
manager = self._get_manager()
|
||||
|
||||
log.debug("Trying to start libvirtd through systemd")
|
||||
unitname = "libvirtd.service"
|
||||
libvirtd_installed = False
|
||||
libvirtd_active = False
|
||||
unitpath = None
|
||||
|
||||
# Fetch all units from systemd
|
||||
try:
|
||||
bus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
|
||||
systemd = Gio.DBusProxy.new_sync(bus, 0, None,
|
||||
"org.freedesktop.systemd1",
|
||||
"/org/freedesktop/systemd1",
|
||||
"org.freedesktop.systemd1.Manager", None)
|
||||
units = systemd.ListUnits()
|
||||
log.debug("Successfully listed units via systemd")
|
||||
except Exception:
|
||||
units = []
|
||||
log.exception("Couldn't connect to systemd")
|
||||
libvirtd_installed = os.path.exists("/var/run/libvirt")
|
||||
libvirtd_active = os.path.exists("/var/run/libvirt/libvirt-sock")
|
||||
|
||||
# Check if libvirtd is installed and running
|
||||
for unitinfo in units:
|
||||
if unitinfo[0] != unitname:
|
||||
continue
|
||||
libvirtd_installed = True
|
||||
libvirtd_active = unitinfo[3] == "active"
|
||||
unitpath = unitinfo[6]
|
||||
break
|
||||
|
||||
log.debug("libvirtd_installed=%s libvirtd_active=%s unitpath=%s",
|
||||
libvirtd_installed, libvirtd_active, unitpath)
|
||||
|
||||
# If it's not running, try to start it
|
||||
try:
|
||||
if unitpath and libvirtd_installed and not libvirtd_active:
|
||||
unit = Gio.DBusProxy.new_sync(
|
||||
bus, 0, None,
|
||||
"org.freedesktop.systemd1", unitpath,
|
||||
"org.freedesktop.systemd1.Unit", None)
|
||||
if not self.config.CLITestOptions.first_run:
|
||||
unit.Start("(s)", "fail")
|
||||
time.sleep(2)
|
||||
libvirtd_active = True
|
||||
except Exception:
|
||||
log.exception("Error starting libvirtd")
|
||||
from .lib import connectauth
|
||||
|
||||
tryuri = vmmCreateConn.default_uri()
|
||||
log.debug("Probed default URI=%s", tryuri)
|
||||
if self.config.CLITestOptions.first_run:
|
||||
log.debug("--test-first-run, using uri=None to trigger error")
|
||||
tryuri = None
|
||||
else:
|
||||
tryuri = vmmCreateConn.default_uri()
|
||||
log.debug("Probed default URI=%s", tryuri)
|
||||
|
||||
# Manager fail message
|
||||
msg = ""
|
||||
if not libvirtd_installed:
|
||||
msg += _("The libvirtd service does not appear to be installed. "
|
||||
"Install and run the libvirtd service to manage "
|
||||
"virtualization on this host.")
|
||||
elif not libvirtd_active:
|
||||
msg += _("libvirtd is installed but not running. Start the "
|
||||
"libvirtd service to manage virtualization on this host.")
|
||||
|
||||
if not tryuri or "qemu" not in tryuri:
|
||||
if msg:
|
||||
msg += "\n\n"
|
||||
msg += _("Could not detect a default hypervisor. Make "
|
||||
"sure the appropriate QEMU/KVM virtualization "
|
||||
"packages are installed to manage virtualization "
|
||||
"on this host.")
|
||||
|
||||
manager = self._get_manager()
|
||||
msg = connectauth.setup_first_uri(self.config, tryuri)
|
||||
if msg:
|
||||
msg += "\n\n"
|
||||
msg += _("A virtualization connection can be manually "
|
||||
"added via File->Add Connection")
|
||||
|
||||
|
||||
if (tryuri is None or
|
||||
not libvirtd_installed or
|
||||
not libvirtd_active):
|
||||
manager.set_startup_error(msg)
|
||||
return
|
||||
|
||||
|
||||
@ -198,3 +198,94 @@ def connect_error(conn, errmsg, tb, warnconsole):
|
||||
ConnectError = collections.namedtuple("ConnectError",
|
||||
["msg", "details", "title"])
|
||||
return ConnectError(msg, details, title)
|
||||
|
||||
|
||||
##################################
|
||||
# App first run connection setup #
|
||||
##################################
|
||||
|
||||
def _start_libvirtd(config):
|
||||
log.debug("Trying to start libvirtd through systemd")
|
||||
|
||||
unitname = "libvirtd.service"
|
||||
libvirtd_installed = False
|
||||
libvirtd_active = False
|
||||
unitpath = None
|
||||
|
||||
# Fetch all units from systemd
|
||||
try:
|
||||
bus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
|
||||
systemd = Gio.DBusProxy.new_sync(bus, 0, None,
|
||||
"org.freedesktop.systemd1",
|
||||
"/org/freedesktop/systemd1",
|
||||
"org.freedesktop.systemd1.Manager", None)
|
||||
units = systemd.ListUnits()
|
||||
log.debug("Successfully listed units via systemd")
|
||||
except Exception:
|
||||
units = []
|
||||
log.exception("Couldn't connect to systemd")
|
||||
libvirtd_installed = os.path.exists("/var/run/libvirt")
|
||||
libvirtd_active = os.path.exists("/var/run/libvirt/libvirt-sock")
|
||||
|
||||
# Check if libvirtd is installed and running
|
||||
for unitinfo in units:
|
||||
if unitinfo[0] != unitname:
|
||||
continue
|
||||
libvirtd_installed = True
|
||||
libvirtd_active = unitinfo[3] == "active"
|
||||
unitpath = unitinfo[6]
|
||||
break
|
||||
|
||||
log.debug("libvirtd_installed=%s libvirtd_active=%s unitpath=%s",
|
||||
libvirtd_installed, libvirtd_active, unitpath)
|
||||
|
||||
# If it's not running, try to start it
|
||||
try:
|
||||
if unitpath and libvirtd_installed and not libvirtd_active:
|
||||
unit = Gio.DBusProxy.new_sync(
|
||||
bus, 0, None,
|
||||
"org.freedesktop.systemd1", unitpath,
|
||||
"org.freedesktop.systemd1.Unit", None)
|
||||
if not config.CLITestOptions.first_run:
|
||||
unit.Start("(s)", "fail")
|
||||
time.sleep(2)
|
||||
libvirtd_active = True
|
||||
except Exception:
|
||||
log.exception("Error starting libvirtd")
|
||||
|
||||
return libvirtd_installed, libvirtd_active
|
||||
|
||||
|
||||
def setup_first_uri(config, tryuri):
|
||||
libvirtd_installed, libvirtd_active = _start_libvirtd(config)
|
||||
|
||||
if tryuri and libvirtd_installed and libvirtd_active:
|
||||
return
|
||||
|
||||
# Manager fail message
|
||||
msg = ""
|
||||
if not libvirtd_installed:
|
||||
msg += _("The libvirtd service does not appear to be installed. "
|
||||
"Install and run the libvirtd service to manage "
|
||||
"virtualization on this host.")
|
||||
elif not libvirtd_active:
|
||||
msg += _("libvirtd is installed but not running. Start the "
|
||||
"libvirtd service to manage virtualization on this host.")
|
||||
|
||||
if not tryuri or "qemu" not in tryuri:
|
||||
if msg:
|
||||
msg += "\n\n"
|
||||
msg += _("Could not detect a default hypervisor. Make "
|
||||
"sure the appropriate QEMU/KVM virtualization "
|
||||
"packages are installed to manage virtualization "
|
||||
"on this host.")
|
||||
|
||||
if msg:
|
||||
msg += "\n\n"
|
||||
msg += _("A virtualization connection can be manually "
|
||||
"added via File->Add Connection")
|
||||
|
||||
if (tryuri is None or
|
||||
not libvirtd_installed or
|
||||
not libvirtd_active):
|
||||
return msg
|
||||
|
||||
Loading…
Reference in New Issue
Block a user