From a446af94dc3db4e83f6d7d90597e8b2bd3684ec2 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 4 Feb 2024 14:42:40 +0100
Subject: fix debian usb installer and upgrade ele-calypso to debian/bookworm

---
 dan/host_vars/ele-calypso.yml             | 39 +++++++++++++++++--------------
 inventory/host_vars/ele-calypso.yml       |  7 ++----
 roles/installer/debian/usb/tasks/main.yml |  1 -
 roles/installer/debian/usb/vars/main.yml  |  1 +
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/dan/host_vars/ele-calypso.yml b/dan/host_vars/ele-calypso.yml
index 540c7d1f..9f5414af 100644
--- a/dan/host_vars/ele-calypso.yml
+++ b/dan/host_vars/ele-calypso.yml
@@ -1,19 +1,22 @@
 $ANSIBLE_VAULT;1.2;AES256;dan
-31333161353163326666656439363137373562373163393933366262646562313730636630663435
-6365636333333661356239373361663731323031333363610a313036386631646538366533396435
-38633761383939363933646662353733363830366131613265623938643465383431626636616434
-6331326331373830650a623832396332383831636662353963356632653331353433326133336532
-31303166326536333534336637613966643461333931663362633164623361336362393731653437
-35653665646166666434643266663638383265656136616465316564373238353937306231666463
-39653636626531336238353139313234356634636462393836666139306433363032626662653434
-65376630643332636239386436653438623132336161613131313962373636363861623635323536
-62356364626162326165643236636164623865346164333662396261663764386230663134636362
-66383935616463653033333465376539623761623065646537383461613035303234363134636165
-38386236336265363639626165383134623935313363393632333134343831646666653639313231
-36333263363264616262363061383631336534633163303137366235646336613939393630623763
-35353339623337303366343137323664376365306538633364663661663730623934373431393434
-34343563303434663363303362316630646565306662643435613535333236306466643035636430
-64663736656265666635643431366632363230353433643933666362376630343933653136323037
-33386534646133633737336564366635313238333833366139653135636139643935623539643935
-62393234316664663236373132376234383264656462663066636662373131383630636531323034
-6534306465323130363165313830643065386336323164386166
+37393363613766653939336635386264386434393136373236366330333131363764343633633639
+6436353937376339383233313335396163663134373635650a653365666539313130613464383666
+62623964383261303365366161373938366131366465366433636364356639333766313162303766
+6164373537316331300a666137633636353332363838303236306465313462346366633934386564
+35643031646134613239623931343062643431366139643462323032316334376234633834653964
+32383235636264653764323364313164313435366564393038393963383963373839353463616431
+38393835333661386461623836333135353066356464636638303433386236616538393465326330
+39336330313039353664663961363965383231303863613530383465636133633637643135373838
+39326132623961376133613034663330366237396361373239336238363461353232363333303330
+32616238303262326665353162383263353764653732663366313437353161343333653962663863
+37313630613232333637376234656533313831666331326263363130343236626633663838643535
+33343864323436353236373464633866656532313936613736303733616639393831353137636238
+32363630396361323139613630666238623434373636646265353832313639306333326231666633
+64616634656665366663666435313464333432346135346563383131333061353635316362326434
+65623132316538616137323234656536666663303839383066666136633464313131373737316131
+36333564636630633130353465346461373761303764323738663638653761373263313438333335
+66333066393934633939313834303564623235353436396231393739613639633366343538383364
+66353835633561356266366233313439363433666565636537313139636536356333316463356363
+30346565646638346337613461376631663965343439303139643035303562393131613166313663
+63376233376638376539333533643639393062653639343262313838643430373339303635393437
+6537
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index 854b76e0..3b33a6a0 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -27,11 +27,6 @@ network:
     - "{{ network_zones.emc.vlan }}"
 
 
-apt_repo_components:
-  - main
-  - contrib
-  - non-free ## for microcode updates
-
 spreadspace_apt_repo_components:
   - main
   - container
@@ -180,6 +175,8 @@ grafana_dashboards:
  - file: ipmi
    datasource: "Prometheus"
 
+grafana_admin_password: "{{ vault_grafana_admin_password }}"
+
 
 monitoring_landingpage_hostnames:
   - "_"
diff --git a/roles/installer/debian/usb/tasks/main.yml b/roles/installer/debian/usb/tasks/main.yml
index 13219b8c..afe72686 100644
--- a/roles/installer/debian/usb/tasks/main.yml
+++ b/roles/installer/debian/usb/tasks/main.yml
@@ -17,7 +17,6 @@
     debian_installer_distro: "{{ install_distro }}"
     debian_installer_codename: "{{ install_codename }}"
     debian_installer_arch: "{{ install.arch | default('amd64') }}"
-    debian_installer_variant: netboot
   import_role:
     role: installer/debian/fetch
 
diff --git a/roles/installer/debian/usb/vars/main.yml b/roles/installer/debian/usb/vars/main.yml
index de222269..0ae8ced2 100644
--- a/roles/installer/debian/usb/vars/main.yml
+++ b/roles/installer/debian/usb/vars/main.yml
@@ -1,2 +1,3 @@
 ---
+debian_installer_variant: netboot
 debian_installer_usb_kernel_images_stale: "{{ _debian_installer_kernel_image_ | dict2items | map(attribute='value') | unique | difference(debian_installer_kernel_image) | list }}"
-- 
cgit v1.2.3