Revert DR06 Ethernet switches back to our management

etc/kayobe/inventory/host_vars/ethsw-dr06-u15

@@ -141,47 +141,32 @@ switch_interface_config:
       - "no shutdown"
       # Tagged on uplink
       - "tagged Po 49"
+      - "untagged gigabitethernet 1/1-1/28"
   vlan 610:
     description: arcus-Prod-610-WInspect
     config:
       - "no shutdown"
       # Tagged on uplink
       - "tagged Po 49"
-  vlan 202:
-    description: IRIS-Prod-202-BMC
-    config:
-      - "no shutdown"
-      # Tagged on uplink
-      - "tagged Po 49"
-      # Untagged on compute node shared LOM ports
-      - "untagged gigabitethernet 1/1-1/28"
-      # Give an in-band interface on IRIS-Prod-202-BMC
-      - "ip address 10.202.4.251/16"
-  vlan 310:
-    description: IRIS-Test-310-WInspect
-    config:
-      - "no shutdown"
-      # Tagged on uplink
-      - "tagged Po 49"
 
 # Interface configuration for enabling hardware discovery. After discovery
 # Neutron owns the configuration of these ports. Has the same format as
 # switch_interface_config.
 switch_interface_config_enable_discovery:
-  vlan 310:
-    description: IRIS-Test-310-WInspect
+  vlan 610:
+    description: arcus-Prod-610-WInspect
     # Compute nodes.
     config: >
-      {{ switch_interface_config['vlan 310'].config +
+      {{ switch_interface_config['vlan 610'].config +
          ['untagged gigabitethernet 1/1-1/28'] }}
 
 # Interface configuration for disabling hardware discovery. After discovery
 # Neutron owns the configuration of these ports. Has the same format as
 # switch_interface_config.
 switch_interface_config_disable_discovery:
-  vlan 310:
-    description: IRIS-Test-310-WInspect
+  vlan 610:
+    description: arcus-Prod-610-WInspect
     # Compute nodes.
     config: >
-      {{ switch_interface_config['vlan 310'].config +
+      {{ switch_interface_config['vlan 610'].config +
          ['no untagged gigabitethernet 1/1-1/28'] }}

etc/kayobe/inventory/host_vars/ethsw-dr06-u20

@@ -154,47 +154,32 @@ switch_interface_config:
       - "no shutdown"
       # Tagged on uplink
       - "tagged Po 49"
+      - "untagged gigabitethernet 1/1-1/28"
   vlan 610:
     description: arcus-Prod-610-WInspect
     config:
       - "no shutdown"
       # Tagged on uplink
       - "tagged Po 49"
-  vlan 202:
-    description: IRIS-Prod-202-BMC
-    config:
-      - "no shutdown"
-      # Tagged on uplink
-      - "tagged Po 49"
-      # Untagged on compute node shared LOM ports
-      - "untagged gigabitethernet 1/1-1/28"
-      # Give an in-band interface on IRIS-Prod-202-BMC
-      - "ip address 10.202.4.252/16"
-  vlan 310:
-    description: IRIS-Test-310-WInspect
-    config:
-      - "no shutdown"
-      # Tagged on uplink
-      - "tagged Po 49"
 
 # Interface configuration for enabling hardware discovery. After discovery
 # Neutron owns the configuration of these ports. Has the same format as
 # switch_interface_config.
 switch_interface_config_enable_discovery:
-  vlan 310:
-    description: IRIS-Test-310-WInspect
+  vlan 610:
+    description: arcus-Prod-610-WInspect
     # Compute nodes.
     config: >
-      {{ switch_interface_config['vlan 310'].config +
+      {{ switch_interface_config['vlan 610'].config +
          ['untagged gigabitethernet 1/1-1/28'] }}
 
 # Interface configuration for disabling hardware discovery. After discovery
 # Neutron owns the configuration of these ports. Has the same format as
 # switch_interface_config.
 switch_interface_config_disable_discovery:
-  vlan 310:
+  vlan 610:
     description: IRIS-Test-310-WInspect
     # Compute nodes.
     config: >
-      {{ switch_interface_config['vlan 310'].config +
+      {{ switch_interface_config['vlan 610'].config +
          ['no untagged gigabitethernet 1/1-1/28'] }}