From 61bc25757b6016a41a60095b937800a78f882946 Mon Sep 17 00:00:00 2001 From: Nicholas Morey Date: Mon, 11 Mar 2024 00:08:05 +0000 Subject: [PATCH 1/3] feat: move rubrik-a to k8s hosts net Signed-off-by: Nicholas Morey --- terraform/rubrik/maas.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/terraform/rubrik/maas.tf b/terraform/rubrik/maas.tf index 480178f..81e5aee 100644 --- a/terraform/rubrik/maas.tf +++ b/terraform/rubrik/maas.tf @@ -144,36 +144,36 @@ resource "maas_network_interface_physical" "rubrik_a_eno1" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:52:0f:8c" name = "eno1" - vlan = maas_vlan.lab.id + vlan = maas_vlan.k8s_hosts.id } resource "maas_network_interface_physical" "rubrik_a_eno2" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:52:0f:8d" name = "eno2" - vlan = maas_vlan.lab.id + vlan = maas_vlan.k8s_hosts.id } resource "maas_network_interface_physical" "rubrik_a_ens1f0" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:58:47:18" name = "ens1f0" - vlan = maas_vlan.lab.id + vlan = maas_vlan.k8s_hosts.id } resource "maas_network_interface_physical" "rubrik_a_ens1f1" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:58:47:19" name = "ens1f1" - vlan = maas_vlan.lab.id + vlan = maas_vlan.k8s_hosts.id } resource "maas_network_interface_link" "rubrik_a_eno1" { machine = maas_machine.rubrik_a.id network_interface = maas_network_interface_physical.rubrik_a_eno1.id - subnet = maas_subnet.lab.id + subnet = maas_subnet.k8s_hosts.cidr mode = "STATIC" - ip_address = "192.168.3.15" + ip_address = "192.168.8.10" default_gateway = true } From 91fd61bbc1a266c8087c4f8f44d40737c83ee320 Mon Sep 17 00:00:00 2001 From: Nicholas Morey Date: Mon, 11 Mar 2024 00:46:08 +0000 Subject: [PATCH 2/3] fix: Revert "feat: move rubrik-a to k8s hosts net" This reverts commit 61bc25757b6016a41a60095b937800a78f882946. --- terraform/rubrik/maas.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/terraform/rubrik/maas.tf b/terraform/rubrik/maas.tf index 81e5aee..480178f 100644 --- a/terraform/rubrik/maas.tf +++ b/terraform/rubrik/maas.tf @@ -144,36 +144,36 @@ resource "maas_network_interface_physical" "rubrik_a_eno1" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:52:0f:8c" name = "eno1" - vlan = maas_vlan.k8s_hosts.id + vlan = maas_vlan.lab.id } resource "maas_network_interface_physical" "rubrik_a_eno2" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:52:0f:8d" name = "eno2" - vlan = maas_vlan.k8s_hosts.id + vlan = maas_vlan.lab.id } resource "maas_network_interface_physical" "rubrik_a_ens1f0" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:58:47:18" name = "ens1f0" - vlan = maas_vlan.k8s_hosts.id + vlan = maas_vlan.lab.id } resource "maas_network_interface_physical" "rubrik_a_ens1f1" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:58:47:19" name = "ens1f1" - vlan = maas_vlan.k8s_hosts.id + vlan = maas_vlan.lab.id } resource "maas_network_interface_link" "rubrik_a_eno1" { machine = maas_machine.rubrik_a.id network_interface = maas_network_interface_physical.rubrik_a_eno1.id - subnet = maas_subnet.k8s_hosts.cidr + subnet = maas_subnet.lab.id mode = "STATIC" - ip_address = "192.168.8.10" + ip_address = "192.168.3.15" default_gateway = true } From 31379beb5908112a66e9bff115f2cf503ed1134c Mon Sep 17 00:00:00 2001 From: Nicholas Morey Date: Mon, 11 Mar 2024 17:29:18 +0000 Subject: [PATCH 3/3] fix: set k8s-hosts on 10g link Signed-off-by: Nicholas Morey --- terraform/rubrik/maas.tf | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/terraform/rubrik/maas.tf b/terraform/rubrik/maas.tf index 480178f..2c0b6d6 100644 --- a/terraform/rubrik/maas.tf +++ b/terraform/rubrik/maas.tf @@ -158,25 +158,34 @@ resource "maas_network_interface_physical" "rubrik_a_ens1f0" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:58:47:18" name = "ens1f0" - vlan = maas_vlan.lab.id + vlan = 0 } resource "maas_network_interface_physical" "rubrik_a_ens1f1" { machine = maas_machine.rubrik_a.id mac_address = "0c:c4:7a:58:47:19" name = "ens1f1" - vlan = maas_vlan.lab.id + vlan = maas_vlan.k8s_hosts.id } resource "maas_network_interface_link" "rubrik_a_eno1" { machine = maas_machine.rubrik_a.id network_interface = maas_network_interface_physical.rubrik_a_eno1.id - subnet = maas_subnet.lab.id + subnet = maas_subnet.lab.cidr mode = "STATIC" ip_address = "192.168.3.15" default_gateway = true } +resource "maas_network_interface_link" "rubrik_a_ens1f1" { + machine = maas_machine.rubrik_a.id + network_interface = maas_network_interface_physical.rubrik_a_ens1f1.id + subnet = maas_subnet.k8s_hosts.cidr + mode = "STATIC" + ip_address = "192.168.8.10" + default_gateway = false +} + resource "maas_block_device" "rubrik_a_sdb" { machine = maas_machine.rubrik_a.id name = "sdb"