yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vms/run: don't use deprecated clanCore option

Browse Source
This commit is contained in:
Jörg Thalheim
2024-10-08 12:03:35 +02:00
committed by Mic92
parent 2f7c3778d3
commit c33b2b200a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/clan-cli/clan_cli/vms/run.py
View File

@@ -31,13 +31,14 @@ log = logging.getLogger(__name__)
def facts_to_nixos_config(facts: dict[str, dict[str, bytes]]) -> dict: def facts_to_nixos_config(facts: dict[str, dict[str, bytes]]) -> dict:
nixos_config: dict = {} nixos_config: dict = {}
nixos_config["clanCore"] = {} nixos_config["clan"] = {}
nixos_config["clanCore"]["secrets"] = {} nixos_config["clan"]["core"] = {}
nixos_config["clan"]["core"]["secrets"] = {}
for service, service_facts in facts.items(): for service, service_facts in facts.items():
nixos_config["clanCore"]["secrets"][service] = {} nixos_config["clan"]["core"]["secrets"][service] = {}
nixos_config["clanCore"]["secrets"][service]["facts"] = {} nixos_config["clan"]["core"]["secrets"][service]["facts"] = {}
for fact, value in service_facts.items(): for fact, value in service_facts.items():
nixos_config["clanCore"]["secrets"][service]["facts"][fact] = { nixos_config["clan"]["core"]["secrets"][service]["facts"][fact] = {
"value": value.decode() "value": value.decode()
} }
return nixos_config return nixos_config

2
pkgs/clan-cli/tests/test_vms_cli.py
View File

@@ -68,7 +68,7 @@ def test_vm_persistence(
config["my_machine"]["systemd"]["services"]["logrotate-checkconf"]["enable"] = False config["my_machine"]["systemd"]["services"]["logrotate-checkconf"]["enable"] = False
config["my_machine"]["services"]["getty"]["autologinUser"] = "root" config["my_machine"]["services"]["getty"]["autologinUser"] = "root"
config["my_machine"]["clan"]["virtualisation"] = {"graphics": False} config["my_machine"]["clan"]["virtualisation"] = {"graphics": False}
config["my_machine"]["clan"]["networking"] = {"targetHost": "client"} config["my_machine"]["clan"]["core"]["networking"] = {"targetHost": "client"}
config["my_machine"]["clan"]["core"]["state"]["my_state"]["folders"] = [ config["my_machine"]["clan"]["core"]["state"]["my_state"]["folders"] = [
# to be owned by root # to be owned by root
"/var/my-state", "/var/my-state",