From 16f1141bf3b7a44663dec241626495245b23218f Mon Sep 17 00:00:00 2001 From: Andreas Glashauser Date: Thu, 3 Apr 2025 15:27:42 +0200 Subject: [PATCH] DELETED: redundant salt states for llm, use openwebui instead --- user_salt/llm/init.sls | 5 -- user_salt/llm/llm--configure-qube.sls | 75 ------------------------- user_salt/llm/llm--create-qube.sls | 30 ---------- user_salt/llm/llm--create-template.sls | 26 --------- user_salt/llm/llm--install-packages.sls | 11 ---- 5 files changed, 147 deletions(-) delete mode 100644 user_salt/llm/init.sls delete mode 100644 user_salt/llm/llm--configure-qube.sls delete mode 100644 user_salt/llm/llm--create-qube.sls delete mode 100644 user_salt/llm/llm--create-template.sls delete mode 100644 user_salt/llm/llm--install-packages.sls diff --git a/user_salt/llm/init.sls b/user_salt/llm/init.sls deleted file mode 100644 index 61f42d6..0000000 --- a/user_salt/llm/init.sls +++ /dev/null @@ -1,5 +0,0 @@ -include: - - llm.llm--create-template - - llm.llm--install-packages - - llm.llm--create-qube - - llm.llm--configure-qube diff --git a/user_salt/llm/llm--configure-qube.sls b/user_salt/llm/llm--configure-qube.sls deleted file mode 100644 index 6bc2ad5..0000000 --- a/user_salt/llm/llm--configure-qube.sls +++ /dev/null @@ -1,75 +0,0 @@ -{% if grains['id'] == 'dom0' %} - -llm--configure-qube-firewall: - cmd.run: - - name: | - qvm-firewall q-llm reset - qvm-firewall q-llm del accept - qvm-firewall q-llm add accept specialtarget=dns - qvm-firewall q-llm add accept proto=icmp - qvm-firewall q-llm add accept ghcr.io proto=tcp - qvm-firewall q-llm add accept pkg-containers.githubusercontent.com proto=tcp - qvm-firewall q-llm add accept openrouter.ai proto=tcp - qvm-firewall q-llm add drop - -{% elif grains['id'] == 'q-llm' %} - -{% set username = 'user' %} -{% set container_name = 'open-webui' %} -{% set service_file_dir = '/home/' ~ username ~ '/.config/systemd/user/' %} -{% set service_file = '/home/' ~ username ~ '/.config/systemd/user/container-' ~ container_name ~ '.service' %} -{% set userid = salt['user.info'](username).uid %} -{% set quadlet_file_dir = '/home/' ~ username ~ '/.config/containers/systemd/' %} -{% set quadlet_file_path = quadlet_file_dir ~ container_name ~ '.container' %} - -{% set xdg_runtime_dir = '/run/user' + userid | string %} - -llm--create-quadlet-dir: - file.directory: - - name: /home/{{ username }}/.config/containers/systemd/ - - user: {{ username }} - - group: {{ username }} - - makedirs: True - -llm--deploy-quadlet-file: - file.managed: - - name: /home/{{ username }}/.config/containers/systemd/open-webui.container - - contents: | - [Unit] - Description=Open WebUI container managed by Podman - - [Container] - Image=ghcr.io/open-webui/open-webui:ollama - PublishPort=3000:8080 - Volume=ollama:/root/.ollama - Volume=open-webui:/app/backend/data - - [Service] - Restart=always - TimeoutStartSec=1800 - - [Install] - WantedBy=default.target - - user: {{ username }} - - group: {{ username }} - - mode: 644 - - require: - - file: llm--create-quadlet-dir - -llm--enable-linger: - cmd.run: - - name: loginctl enable-linger user - - unless: loginctl show-user user | grep Linger=yes - -llm--reload-user-daemon: - cmd.run: - - name: | - systemctl --user daemon-reload - - runas: {{ username }} - - env: - - XDG_RUNTIME_DIR: /run/user/1000 - - DBUS_SESSION_BUS_ADDRESS: unix:path=/run/user/1000/bus - - require: - - cmd: llm--enable-linger - -{% endif %} diff --git a/user_salt/llm/llm--create-qube.sls b/user_salt/llm/llm--create-qube.sls deleted file mode 100644 index 60006cf..0000000 --- a/user_salt/llm/llm--create-qube.sls +++ /dev/null @@ -1,30 +0,0 @@ -{% if grains['id'] == 'dom0' %} - -llm--create-qube: - qvm.vm: - - name: q-llm - - present: - - template: template-llm - - label: orange - - prefs: - - label: orange - - audiovm: - - guivm: dom0 - - netvm: sys-vpn-mullvad - - memory: 4000 - - maxmem: 8000 - - vcpus: 4 - - features: - - set: - - menu-items: xterm.desktop org.mozilla.firefox.desktop - - service: - - enable: - - shutdown-idle - - require: - - qvm: llm--create-template - -llm--extend-private-storage: - cmd.run: - - name: qvm-volume extend q-llm:private 10737418240 - -{% endif %} diff --git a/user_salt/llm/llm--create-template.sls b/user_salt/llm/llm--create-template.sls deleted file mode 100644 index bf827af..0000000 --- a/user_salt/llm/llm--create-template.sls +++ /dev/null @@ -1,26 +0,0 @@ -{% import "templates/versions.jinja" as version %} - -include: - - templates.templates--install-fedora-minimal - -{% if grains['id'] == 'dom0' %} - -llm--create-template: - qvm.clone: - - name: template-llm - - source: fedora-{{ version.fedora }}-minimal - - class: TemplateVM - - require: - - qvm: templates--install-fedora-{{ version.fedora }}-minimal - -llm--create-template-prefs: - qvm.prefs: - - name: template-llm - - label: orange - - netvm: - - audiovm: - - guivm: - - require: - - qvm: llm--create-template - -{% endif %} diff --git a/user_salt/llm/llm--install-packages.sls b/user_salt/llm/llm--install-packages.sls deleted file mode 100644 index 5d33fc8..0000000 --- a/user_salt/llm/llm--install-packages.sls +++ /dev/null @@ -1,11 +0,0 @@ -{% if grains['id'] == 'template-llm' %} - -llm--install-packages: - pkg.installed: - - pkgs: - - qubes-core-agent-networking - - qubes-app-shutdown-idle - - podman - - firefox - -{% endif %} -- 2.39.5