From 6370069e9d73923c34f5e0cbd58e94aa34653267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Sun, 5 Jul 2026 16:18:07 +0200 Subject: [PATCH] Add new vm_host attribute/value to all VM nodes --- .chef/config.rb | 4 ++-- nodes/akkounts-1.json | 3 ++- nodes/bitcoin-2.json | 3 ++- nodes/discourse-2.json | 3 ++- nodes/drone-1.json | 3 ++- nodes/ejabberd-4.json | 3 ++- nodes/ejabberd-8.json | 3 ++- nodes/garage-11.json | 3 ++- nodes/garage-14.json | 3 ++- nodes/garage-15.json | 3 ++- nodes/garage-16.json | 3 ++- nodes/garage-2.json | 3 ++- nodes/garage-7.json | 3 ++- nodes/garage-8.json | 3 ++- nodes/gitea-2.json | 3 ++- nodes/ipfs-1.json | 3 ++- nodes/ldap-3.kosmos.org.json | 3 ++- nodes/ldap-4.kosmos.org.json | 3 ++- nodes/lq-1.json | 3 ++- nodes/lq-2.json | 3 ++- nodes/mail.kosmos.org.json | 3 ++- nodes/mastodon-3.json | 3 ++- nodes/nodejs-4.json | 3 ++- nodes/postgres-11.json | 3 ++- nodes/postgres-12.json | 3 ++- nodes/prometheus-1.json | 3 ++- nodes/redis-1.json | 3 ++- nodes/redis-2.json | 3 ++- nodes/rs-discourse-1.json | 3 ++- nodes/rsk-mainnet-3.json | 3 ++- nodes/rsk-testnet-4.json | 3 ++- nodes/rsk-testnet-6.json | 3 ++- nodes/sentry-1.json | 3 ++- nodes/strfry-1.json | 3 ++- nodes/wiki-1.json | 3 ++- 35 files changed, 70 insertions(+), 36 deletions(-) diff --git a/.chef/config.rb b/.chef/config.rb index a0f2ce6..6751fcd 100644 --- a/.chef/config.rb +++ b/.chef/config.rb @@ -28,5 +28,5 @@ knife[:automatic_attribute_whitelist] = %w[ # Added to /etc/chef/client.rb on node bootstrap # https://docs.chef.io/attribute_persistence/ -knife[:normal_attribute_allowlist] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty'] -knife[:allowed_normal_attributes] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty'] +knife[:normal_attribute_allowlist] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty', 'vm_host'] +knife[:allowed_normal_attributes] = ['knife_zero', 'kosmos_kvm', 'kosmos-ejabberd', 'openresty', 'vm_host'] diff --git a/nodes/akkounts-1.json b/nodes/akkounts-1.json index 0627a9a..c496c52 100644 --- a/nodes/akkounts-1.json +++ b/nodes/akkounts-1.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.144" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "akkounts-1", diff --git a/nodes/bitcoin-2.json b/nodes/bitcoin-2.json index 707584a..4ccd759 100644 --- a/nodes/bitcoin-2.json +++ b/nodes/bitcoin-2.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.163" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "bitcoin-2", diff --git a/nodes/discourse-2.json b/nodes/discourse-2.json index da4bb5a..bc40c6a 100644 --- a/nodes/discourse-2.json +++ b/nodes/discourse-2.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.35" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "discourse-2", diff --git a/nodes/drone-1.json b/nodes/drone-1.json index befd090..b658d3e 100644 --- a/nodes/drone-1.json +++ b/nodes/drone-1.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.128" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "drone-1", diff --git a/nodes/ejabberd-4.json b/nodes/ejabberd-4.json index 3a148c8..72f50f0 100644 --- a/nodes/ejabberd-4.json +++ b/nodes/ejabberd-4.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.113" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "ejabberd-4", diff --git a/nodes/ejabberd-8.json b/nodes/ejabberd-8.json index 8a41ef2..0e0ef8e 100644 --- a/nodes/ejabberd-8.json +++ b/nodes/ejabberd-8.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.123" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "ejabberd-8", diff --git a/nodes/garage-11.json b/nodes/garage-11.json index 1177218..930d94b 100644 --- a/nodes/garage-11.json +++ b/nodes/garage-11.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.165" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "garage-11", diff --git a/nodes/garage-14.json b/nodes/garage-14.json index 2ca3820..8d9d69c 100644 --- a/nodes/garage-14.json +++ b/nodes/garage-14.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.151" - } + }, + "vm_host": "leo" }, "automatic": { "fqdn": "garage-14", diff --git a/nodes/garage-15.json b/nodes/garage-15.json index 166d7d2..d7b5260 100644 --- a/nodes/garage-15.json +++ b/nodes/garage-15.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.82" - } + }, + "vm_host": "leo" }, "automatic": { "fqdn": "garage-15", diff --git a/nodes/garage-16.json b/nodes/garage-16.json index 5c26e0b..50a0d2b 100644 --- a/nodes/garage-16.json +++ b/nodes/garage-16.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.153" - } + }, + "vm_host": "leo" }, "automatic": { "fqdn": "garage-16", diff --git a/nodes/garage-2.json b/nodes/garage-2.json index 93641a6..9faadf1 100644 --- a/nodes/garage-2.json +++ b/nodes/garage-2.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.40" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "garage-2", diff --git a/nodes/garage-7.json b/nodes/garage-7.json index ab60013..30604e1 100644 --- a/nodes/garage-7.json +++ b/nodes/garage-7.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.182" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "garage-7", diff --git a/nodes/garage-8.json b/nodes/garage-8.json index 3d1527e..b2ccff8 100644 --- a/nodes/garage-8.json +++ b/nodes/garage-8.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.61" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "garage-8", diff --git a/nodes/gitea-2.json b/nodes/gitea-2.json index 931372a..9c122a2 100644 --- a/nodes/gitea-2.json +++ b/nodes/gitea-2.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.21" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "gitea-2", diff --git a/nodes/ipfs-1.json b/nodes/ipfs-1.json index bb82e47..4b70fb0 100644 --- a/nodes/ipfs-1.json +++ b/nodes/ipfs-1.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.198" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "ipfs-1", diff --git a/nodes/ldap-3.kosmos.org.json b/nodes/ldap-3.kosmos.org.json index 9062959..f18fd8a 100644 --- a/nodes/ldap-3.kosmos.org.json +++ b/nodes/ldap-3.kosmos.org.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.6" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "ldap-3.kosmos.org", diff --git a/nodes/ldap-4.kosmos.org.json b/nodes/ldap-4.kosmos.org.json index d5ff769..9f727b6 100644 --- a/nodes/ldap-4.kosmos.org.json +++ b/nodes/ldap-4.kosmos.org.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.106" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "ldap-4.kosmos.org", diff --git a/nodes/lq-1.json b/nodes/lq-1.json index 574ec90..9102a55 100644 --- a/nodes/lq-1.json +++ b/nodes/lq-1.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.87" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "lq-1", diff --git a/nodes/lq-2.json b/nodes/lq-2.json index 5adfc66..09524d4 100644 --- a/nodes/lq-2.json +++ b/nodes/lq-2.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.188" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "lq-2", diff --git a/nodes/mail.kosmos.org.json b/nodes/mail.kosmos.org.json index f3b57b0..f0ee81b 100644 --- a/nodes/mail.kosmos.org.json +++ b/nodes/mail.kosmos.org.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.95" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "mail.kosmos.org", diff --git a/nodes/mastodon-3.json b/nodes/mastodon-3.json index 82aadff..29bb553 100644 --- a/nodes/mastodon-3.json +++ b/nodes/mastodon-3.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.30" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "mastodon-3", diff --git a/nodes/nodejs-4.json b/nodes/nodejs-4.json index 659966b..2181fc0 100644 --- a/nodes/nodejs-4.json +++ b/nodes/nodejs-4.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.138" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "nodejs-4", diff --git a/nodes/postgres-11.json b/nodes/postgres-11.json index 24cec64..8cb74f9 100644 --- a/nodes/postgres-11.json +++ b/nodes/postgres-11.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.91" - } + }, + "vm_host": "leo" }, "automatic": { "fqdn": "postgres-11", diff --git a/nodes/postgres-12.json b/nodes/postgres-12.json index 7fac349..5828eb0 100644 --- a/nodes/postgres-12.json +++ b/nodes/postgres-12.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.134" - } + }, + "vm_host": "her" }, "automatic": { "fqdn": "postgres-12", diff --git a/nodes/prometheus-1.json b/nodes/prometheus-1.json index f76c369..f834101 100644 --- a/nodes/prometheus-1.json +++ b/nodes/prometheus-1.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.146" - } + }, + "vm_host": "leo" }, "automatic": { "fqdn": "prometheus-1", diff --git a/nodes/redis-1.json b/nodes/redis-1.json index cd0fb79..6698a68 100644 --- a/nodes/redis-1.json +++ b/nodes/redis-1.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.225" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "redis-1", diff --git a/nodes/redis-2.json b/nodes/redis-2.json index 07be0f5..2f6d10e 100644 --- a/nodes/redis-2.json +++ b/nodes/redis-2.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.208" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "redis-2", diff --git a/nodes/rs-discourse-1.json b/nodes/rs-discourse-1.json index 6c1a826..b322827 100644 --- a/nodes/rs-discourse-1.json +++ b/nodes/rs-discourse-1.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.187" - } + }, + "vm_host": "fornax" }, "automatic": { "fqdn": "rs-discourse-1", diff --git a/nodes/rsk-mainnet-3.json b/nodes/rsk-mainnet-3.json index 985f06f..8593c70 100644 --- a/nodes/rsk-mainnet-3.json +++ b/nodes/rsk-mainnet-3.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.150" - } + }, + "vm_host": "her" }, "automatic": { "fqdn": "rsk-mainnet-3", diff --git a/nodes/rsk-testnet-4.json b/nodes/rsk-testnet-4.json index a420cf2..51e5d16 100644 --- a/nodes/rsk-testnet-4.json +++ b/nodes/rsk-testnet-4.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.126" - } + }, + "vm_host": "her" }, "automatic": { "fqdn": "rsk-testnet-4", diff --git a/nodes/rsk-testnet-6.json b/nodes/rsk-testnet-6.json index 6246c25..73ae932 100644 --- a/nodes/rsk-testnet-6.json +++ b/nodes/rsk-testnet-6.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.20" - } + }, + "vm_host": "leo" }, "automatic": { "fqdn": "rsk-testnet-6", diff --git a/nodes/sentry-1.json b/nodes/sentry-1.json index a037ffb..52e353d 100644 --- a/nodes/sentry-1.json +++ b/nodes/sentry-1.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.132" - } + }, + "vm_host": "her" }, "automatic": { "fqdn": "sentry-1", diff --git a/nodes/strfry-1.json b/nodes/strfry-1.json index b151730..41f868b 100644 --- a/nodes/strfry-1.json +++ b/nodes/strfry-1.json @@ -4,7 +4,8 @@ "normal": { "knife_zero": { "host": "10.1.1.164" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "strfry-1", diff --git a/nodes/wiki-1.json b/nodes/wiki-1.json index 0dcd3fb..9216e81 100644 --- a/nodes/wiki-1.json +++ b/nodes/wiki-1.json @@ -3,7 +3,8 @@ "normal": { "knife_zero": { "host": "10.1.1.206" - } + }, + "vm_host": "draco" }, "automatic": { "fqdn": "wiki-1",