environments/production.json

@@ -34,15 +34,6 @@
         }
       }
     },
-    "kosmos_kvm": {
-      "backup": {
-        "nodes_excluded": [
-          "garage-2", "garage-3", "garage-4",
-          "postgres-5",
-          "rsk-mainnet-2", "rsk-testnet-3"
-        ]
-      }
-    },
     "kosmos-mastodon": {
       "domain": "kosmos.social",
       "s3_endpoint": "http://localhost:3900",

nodes/draco.kosmos.org.json

@@ -83,9 +83,10 @@
     }
   },
   "run_list": [
-    "role[base]",
-    "role[kvm_host]",
+    "recipe[kosmos-base]",
     "recipe[kosmos_encfs]",
+    "recipe[kosmos_kvm::host]",
+    "recipe[kosmos_kvm::backup]",
     "recipe[kosmos-ejabberd::firewall]",
     "recipe[kosmos-ipfs::firewall_swarm]",
     "recipe[kosmos-bitcoin::firewall]",
@@ -93,4 +94,4 @@
     "role[openresty_proxy]",
     "recipe[sockethub::firewall]"
   ]
-}
+}

nodes/fornax.kosmos.org.json

@@ -99,9 +99,10 @@
     }
   },
   "run_list": [
-    "role[base]",
-    "role[kvm_host]",
+    "recipe[kosmos-base]",
+    "recipe[kosmos_kvm::host]",
+    "recipe[kosmos_kvm::backup]",
     "role[nginx_proxy]",
     "role[zerotier_controller]"
   ]
-}
+}

roles/kvm_host.rb

@@ -1,6 +0,0 @@
-name "kvm_host"
-
-run_list %w(
-  kosmos_kvm::host
-  kosmos_kvm::backup
-)

site-cookbooks/kosmos_kvm/attributes/default.rb

@@ -8,5 +8,3 @@ node.default["kosmos_kvm"]["host"]["qemu_base_image"] = {
 
 # A systemd.timer OnCalendar config value
 node.default["kosmos_kvm"]["backup"]["schedule"] = "daily"
-# Node/VM names excluded from backups
-node.default["kosmos_kvm"]["backup"]["nodes_excluded"] = []

site-cookbooks/kosmos_kvm/recipes/backup.rb

@@ -54,8 +54,6 @@ end
 vm_domains = search(:node, "role:kvm_guest").map{|n| n["hostname"] } \
              & `virsh list --name`.strip.chomp.split("\n")
 
-vm_domains.reject! { |d| node["kosmos_kvm"]["backup"]["nodes_excluded"].include?(d) }
-
 template "/root/backups/backup_all_vms.sh" do
   source "backup_all_vms.sh.erb"
   mode '0750'