From: alex <alex@pdp7.net>
Date: Sun, 6 Oct 2024 18:19:20 +0000 (+0200)
Subject: Use default minimal Incus config instead of a faulty one
X-Git-Tag: 20241020-emacs~25
X-Git-Url: https://xn--ix-yja.es/gitweb/?a=commitdiff_plain;h=fa96d093bcf460b0de52a109394a3f8b912cb161;p=alex.git

Use default minimal Incus config instead of a faulty one
---

diff --git a/personal_infra/puppet/modules/incus/manifests/init.pp b/personal_infra/puppet/modules/incus/manifests/init.pp
index 7791ad9..1d30a40 100644
--- a/personal_infra/puppet/modules/incus/manifests/init.pp
+++ b/personal_infra/puppet/modules/incus/manifests/init.pp
@@ -1,4 +1,4 @@
-class incus($network_device) {
+class incus {
   file {'/etc/apt/keyrings/zabbly.asc':
     content => @(EOT)
     -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -70,45 +70,7 @@ class incus($network_device) {
   ->
   package {'incus':}
 
-  file {'/etc/incus.puppet':
-    content => @("EOT")
-    config: {}
-    networks:
-    - config:
-        ipv4.address: auto
-        ipv6.address: auto
-      description: ""
-      name: incusbr0
-      type: ""
-      project: default
-    storage_pools:
-    - config: {}
-      description: ""
-      name: default
-      driver: dir
-    profiles:
-    - config: {}
-      description: ""
-      devices:
-        eth0:
-          name: $network_device
-          network: incusbr0
-          type: nic
-        root:
-          path: /
-          pool: default
-          type: disk
-      name: default
-    projects: []
-    cluster: null
-    | EOT
-    ,
-  }
-
-  exec {'/usr/bin/incus admin init --preseed </etc/incus.puppet':
-    require => [
-      File['/etc/incus.puppet'],
-      Package['incus'],
-    ],
+  exec {'/usr/bin/incus admin init --minimal':
+    require => Package['incus'],
   }
 }
diff --git a/personal_infra/puppet/site/hideo.mad.int.pdp7.net.pp b/personal_infra/puppet/site/hideo.mad.int.pdp7.net.pp
index 3b027cb..033c910 100644
--- a/personal_infra/puppet/site/hideo.mad.int.pdp7.net.pp
+++ b/personal_infra/puppet/site/hideo.mad.int.pdp7.net.pp
@@ -1,7 +1,5 @@
 node 'hideo.mad.int.pdp7.net' {
   class {'workstation':}
-  class {'incus':
-    network_device => 'wlp3s0',
-  }
+  class {'incus':}
   package {['zfs-dkms', 'sanoid']:}
 }