ksushy bootonce: force boot order

Author: karmab

docs/index.md

@@ -2386,11 +2386,6 @@ For plugging an iso, only virtualization providers can be used.
 
 When deploying the service, an username and password can be specified for securing access through basic authentication
 
-## Using Bootonce with ksushy
-
-Since virtualization providers don't provide a way to restart in a given iso only one time (and because in kcli design, we don't want to mess with boot orders), the `bootonce` overcomes this by running a side process which monitors vms getting rebooted, and restart them instead after removing their iso to make sure they boot from OS.
-
-# Using kcli as a library
 
 You can use kvirt library directly, without the client or to embed it into your own application.
 

docs/index.rst

@@ -2533,14 +2533,6 @@ Restricting ksushy access
 
 When deploying the service, an username and password can be specified for securing access through basic authentication
 
-Using Bootonce with ksushy
---------------------------
-
-Since virtualization providers don’t provide a way to restart in a given iso only one time (and because in kcli design, we don’t want to mess with boot orders), the ``bootonce`` overcomes this by running a side process which monitors vms getting rebooted, and restart them instead after removing their iso to make sure they boot from OS.
-
-Using kcli as a library
-=======================
-
 You can use kvirt library directly, without the client or to embed it into your own application.
 
 Here’s a sample:

kcli.spec

@@ -53,7 +53,6 @@ rm -rf %{buildroot}
 %attr(0755,root,root) %{_bindir}/kweb
 %attr(0755,root,root) %{_bindir}/klist.py
 %attr(0755,root,root) %{_bindir}/ksushy
-%attr(0755,root,root) %{_bindir}/ksushy-isoremover
 %attr(0755,root,root) %{_bindir}/ignitionmerger
 %attr(0755,root,root) %{_bindir}/ekstoken
 %attr(0755,root,root) %{_bindir}/gketoken

kvirt/baseconfig.py

@@ -1454,7 +1454,6 @@ def deploy_ksushy_service(self, port=9000, ssl=False, ipv6=False, user=None, pas
             os.makedirs(os.path.dirname(service_file))
         update = os.path.exists(service_file)
         home = os.environ.get('HOME', '/root')
-        iso_remover = bootonce
         executable = which('ksushy')
         port = f"Environment=KSUSHY_PORT={port}\n" if port != 9000 else ''
         ssl = "Environment=KSUSHY_SSL=true\n" if ssl else ''
@@ -1469,19 +1468,6 @@ def deploy_ksushy_service(self, port=9000, ssl=False, ipv6=False, user=None, pas
         user_space = "--user" if not root else ""
         cmd = f"systemctl {user_space} restart ksushy" if update else f"systemctl {user_space} enable --now ksushy"
         call(cmd, shell=True)
-        if iso_remover:
-            executable = which('ksushy-isoremover')
-            plan = f"Environment=KSUSHY_PLAN={plan}\n" if plan is not None else ''
-            isoremoverdata = kdefaults.ISOSERVICE.format(home=home, executable=executable, plan=plan)
-            if root:
-                service_file = "/etc/systemd/system/ksushy-isoremover.service"
-            else:
-                service_file = f"{os.environ.get('HOME')}/.config/systemd/user/ksushy-isoremover.service"
-            with open(service_file, "w") as f:
-                f.write(isoremoverdata)
-            cmd = f"systemctl {user_space} restart" if update else f"systemctl {user_space} enable --now"
-            cmd += " ksushy-isoremover"
-            call(cmd, shell=True)
 
     def deploy_web_service(self, port=8000, ssl=False, ipv6=False):
         update = os.path.exists("/usr/lib/systemd/system/kweb.service")

kvirt/defaults.py

@@ -229,19 +229,6 @@
 [Install]
 WantedBy=multi-user.target"""
 
-ISOSERVICE = """[Unit]
-Description=Ksushy iso remover service
-After=syslog.target
-[Service]
-Type=simple
-ExecStart={executable}
-StandardOutput=journal
-StandardError=journal
-Environment=HOME={home}
-Environment=PYTHONUNBUFFERED=true
-[Install]
-WantedBy=multi-user.target"""
-
 WEBSERVICE = """[Unit]
 Description=Kweb service
 After=syslog.target

kvirt/ksushy/__init__.py

@@ -200,7 +200,10 @@ def system_reset_action(client, name):
             if reset_type in ['On', 'ForceRestart']:
                 try:
                     pprint(f"Starting vm {name}")
-                    k.start_from_cd(name) if self.bootonce and config.type == 'kvm' else k.start(name)
+                    if config.type == 'kvm' and self.bootonce:
+                        pprint(f"Forcing boot from cdrom for vm {name}")
+                        k.force_cdrom(name)
+                    k.start(name)
                 except subprocess.CalledProcessError as e:
                     error(e)
                     response.status = 400

kvirt/ksushy/isoremover.py

@@ -1439,29 +1439,26 @@ def start(self, name):
                     return {'result': 'failure', 'reason': e}
         return {'result': 'success'}
 
-    def start_from_cd(self, name):
+    def force_cdrom(self, name):
         self.stop(name)
         conn = self.conn
         vm = conn.lookupByName(name)
         xml = vm.XMLDesc(0)
         root = ET.fromstring(xml)
         newxml = ET.tostring(root).decode("utf-8")
+        newxml = newxml.replace('dev="cdrom"', 'dev="TEMP"')
         newxml = newxml.replace('dev="hd"', 'dev="cdrom"')
-        newxml = newxml.replace('dev="network"', 'dev="hd"')
+        newxml = newxml.replace('dev="TEMP"', 'dev="hd"')
         for element in list(root.iter('disk')):
             if element.get('device') == 'cdrom':
-                iso_file = element.find('source').get('file') if element.find('source') is not None else None
-                if iso_file is None or iso_file.endswith(f'{name}.ISO'):
-                    warning(f"No iso found in VM {name}, starting normally")
-                    return self.start(name)
-                boot = element.find('boot') or {}
-                cd_order = boot.get('order')
-                if cd_order is not None:
-                    newxml = newxml.replace("<boot order='1'/>", "<boot order='XX'/>")
-                    newxml = newxml.replace(f"<boot order='{cd_order}'/>", "<boot order='1'/>")
-                    newxml = newxml.replace("<boot order='XX'/>", f"<boot order='{cd_order}'/>")
+                boot = element.find('boot')
+                if boot is not None:
+                    cd_order = boot.get('order')
+                    newxml = newxml.replace('<boot order="1"/> ', '<boot order="TEMP" />')
+                    newxml = newxml.replace(f'<boot order="{cd_order}" />', '<boot order="1" />')
+                    newxml = newxml.replace('<boot order="TEMP"/> ', f'<boot order="{cd_order}" />')
                 break
-        conn.createXML(newxml)
+        conn.defineXML(newxml)
         return {'result': 'success'}
 
     def stop(self, name, soft=False):

kvirt/providers/kvm/__init__.py

@@ -58,7 +58,6 @@
         kweb=kvirt.web.main:run
         klist.py=kvirt.klist:main
         ksushy=kvirt.ksushy.main:run
-        ksushy-isoremover=kvirt.ksushy.isoremover:run
         ignitionmerger=kvirt.ignitionmerger:cli
         ekstoken=kvirt.ekstoken:cli
         gketoken=kvirt.gketoken:cli