diff --git a/modules/system/proxmox/network.nix b/modules/system/proxmox/network.nix index 6a4d6974..03c5a36b 100644 --- a/modules/system/proxmox/network.nix +++ b/modules/system/proxmox/network.nix @@ -116,7 +116,7 @@ }; }; confInternal = { - name = mkAlmostOptionDefault "eth9"; + name = mkIf system.proxmox.container.enable (mkAlmostOptionDefault "eth9"); bridge = mkAlmostOptionDefault "vmbr9"; address4 = mkAlmostOptionDefault "10.9.1.${toString (system.proxmox.vm.id - internalOffset)}/24"; address6 = mkAlmostOptionDefault "fd0c::${toHexString (system.proxmox.vm.id - internalOffset)}/64"; diff --git a/systems/aya/proxmox.nix b/systems/aya/proxmox.nix index c13d0466..0aa9e54d 100644 --- a/systems/aya/proxmox.nix +++ b/systems/aya/proxmox.nix @@ -11,11 +11,12 @@ _: { address4 = "10.1.1.47/24"; address6 = "auto"; }; - net1 = { + net1.internal.enable = true; + net2 = { + name = "eth1"; macAddress = "BC:24:11:C4:66:AA"; networkd.networkSettings.linkConfig.RequiredForOnline = false; }; - net2.internal.enable = true; }; }; } diff --git a/tf/proxmox_vms.tf b/tf/proxmox_vms.tf index 6de6c856..a83f6745 100644 --- a/tf/proxmox_vms.tf +++ b/tf/proxmox_vms.tf @@ -325,8 +325,6 @@ EOT gateway = "10.1.1.1" } } - # empty block required if additional interfaces are added, but causes state sync issues - ip_config {} ip_config { ipv6 { address = "${cidrhost(local.reisen_int_prefix6, local.proxmox_aya_vm_id - local.reisen_int_offset)}/64" @@ -335,6 +333,8 @@ EOT address = "${cidrhost(local.reisen_int_prefix4, local.proxmox_aya_vm_id - local.reisen_int_offset)}/24" } } + # empty block causes state sync issues + #ip_config {} } startup { @@ -347,15 +347,15 @@ EOT name = "eth0" mac_address = "BC:24:11:C4:66:A9" } - network_interface { - name = "eth1" - mac_address = "BC:24:11:C4:66:AA" - } network_interface { name = "eth9" mac_address = "BC:24:19:C4:66:A9" bridge = proxmox_virtual_environment_network_linux_bridge.internal.name } + network_interface { + name = "eth1" + mac_address = "BC:24:11:C4:66:AA" + } operating_system { template_file_id = var.proxmox_container_template