nxos-vxlan - lab cleanup

scenarios/networking-lab/devstack-nxsw-vxlan/automation-vars.yml

@@ -32,7 +32,7 @@ stages:
         exit 1
       fi
 
-      ssh -o StrictHostKeyChecking=no stack@devstack.netlab.example.com "
+      ssh -o StrictHostKeyChecking=no stack@devstack.stack.lab "
         ROUTES=\$(ip -j r)
         ROUTE_EXISTS=\$(echo \"\$ROUTES\" | python3 -c '
       import sys, json
@@ -102,28 +102,15 @@ stages:
       Transitions nodes from 'enroll' to 'manageable' state. This validates
       basic hardware connectivity and prepares nodes for further operations.
     shell: |
-      set -xe -o pipefail
+      set -x -o pipefail
 
       # Get list of node UUIDs
       node_uuids=$(openstack --os-cloud devstack-admin baremetal node list -f value -c UUID)
 
-      # Manage each node
+      # Manage each node with --wait (300 second timeout)
       for uuid in $node_uuids; do
         echo "Managing node: $uuid"
-        openstack --os-cloud devstack-admin baremetal node manage $uuid
-      done
-
-      # Wait for manageable state
-      counter=0
-      max_retries=60
-      until ! openstack --os-cloud devstack-admin baremetal node list -f value -c "Provisioning State" | grep -v "manageable"; do
-        ((counter++))
-        if (( counter > max_retries )); then
-          echo "ERROR: Timeout waiting for nodes to reach manageable state"
-          openstack --os-cloud devstack-admin baremetal node list
-          exit 1
-        fi
-        sleep 5
+        openstack --os-cloud devstack-admin baremetal node manage --wait 300 $uuid
       done
 
       echo "All nodes successfully reached manageable state"

scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml

@@ -37,7 +37,7 @@ parameters:
     type: json
     default:
       image: ubuntu-noble-server
-      flavor: hotstack.xxlarge
+      flavor: hotstack.large
   ironic_params:
     type: json
     default:
@@ -425,12 +425,12 @@ resources:
               str_replace:
                 template: |
                   # Host records
-                  host-record=controller-0.netlab.example.com,$controller0
-                  host-record=spine01.netlab.example.com,$spine01
-                  host-record=spine02.netlab.example.com,$spine02
-                  host-record=leaf01.netlab.example.com,$leaf01
-                  host-record=leaf02.netlab.example.com,$leaf02
-                  host-record=devstack.netlab.example.com,$devstack
+                  host-record=controller-0.stack.lab,$controller0
+                  host-record=spine01.stack.lab,$spine01
+                  host-record=spine02.stack.lab,$spine02
+                  host-record=leaf01.stack.lab,$leaf01
+                  host-record=leaf02.stack.lab,$leaf02
+                  host-record=devstack.stack.lab,$devstack
                 params:
                   $controller0: {get_attr: [controller-machine-port, fixed_ips, 0, ip_address]}
                   $spine01: {get_attr: [spine01-machine-port, fixed_ips, 0, ip_address]}
@@ -902,7 +902,7 @@ resources:
     properties:
       cloud_config:
         hostname: devstack
-        fqdn: devstack.netlab.example.com
+        fqdn: devstack.stack.lab
 
 
   devstack-write-files:
@@ -1104,21 +1104,6 @@ outputs:
             dhcp6: false
             set-name: trunk0
             mtu: 1442
-        vlans:
-          trunk0.100:
-            id: 100
-            link: trunk0
-            mtu: 1442
-            dhcp4: false
-            addresses:
-              - list_join:
-                  - ''
-                  - - {get_attr: [devstack-public-vlan100-port, fixed_ips, 0, ip_address]}
-                    - '/'
-                    - str_split:
-                        - '/'
-                        - {get_attr: [devstack-public-vlan100-port, subnets, 0, cidr]}
-                        - 1
 
   sushy_emulator_uuids:
     description: UUIDs of instances to manage with sushy-tools - RedFish virtual BMC
@@ -1140,7 +1125,7 @@ outputs:
           boot_interface: redfish-virtual-media
           network_interface: neutron
           driver_info:
-            redfish_address: http://controller-0.netlab.example.com:8000
+            redfish_address: http://controller-0.stack.lab:8000
             redfish_system_id:
               str_replace:
                 template: "/redfish/v1/Systems/$SYS_ID"
@@ -1158,7 +1143,7 @@ outputs:
             - address: {get_attr: [ironic0-port, mac_address]}
               physical_network: public
               local_link_connection:
-                switch_info: leaf01.netlab.example.com
+                switch_info: leaf01.stack.lab
                 switch_id: "22:57:f8:dd:03:01"
                 port_id: "ethernet1/4"
         - name: ironic1
@@ -1167,7 +1152,7 @@ outputs:
           boot_interface: redfish-virtual-media
           network_interface: neutron
           driver_info:
-            redfish_address: http://controller-0.netlab.example.com:8000
+            redfish_address: http://controller-0.stack.lab:8000
             redfish_system_id:
               str_replace:
                 template: "/redfish/v1/Systems/$SYS_ID"
@@ -1185,7 +1170,7 @@ outputs:
             - address: {get_attr: [ironic1-port, mac_address]}
               physical_network: public
               local_link_connection:
-                switch_info: leaf02.netlab.example.com
+                switch_info: leaf02.stack.lab
                 switch_id: "22:57:f8:dd:04:01"
                 port_id: "ethernet1/4"
 

scenarios/networking-lab/devstack-nxsw-vxlan/l2vni_network_nodes.yaml

@@ -10,7 +10,10 @@ network_nodes:
   - hostname: "devstack"
     trunks:
       - physical_network: public
-        local_link_connection:
-          switch_id: "22:57:f8:dd:03:01"
-          port_id: "Ethernet1/5"
-          switch_info: "leaf01.netlab.example.com"
+        local_link_information:
+          - switch_id: "22:57:f8:dd:03:01"
+            port_id: "Ethernet1/3"
+            switch_info: "leaf01.stack.lab"
+          - switch_id: "22:57:f8:dd:03:01"
+            port_id: "Ethernet1/5"
+            switch_info: "leaf01.stack.lab"

scenarios/networking-lab/devstack-nxsw-vxlan/leaf01-poap.cfg

@@ -1,4 +1,4 @@
-hostname leaf01.netlab.example.com
+hostname leaf01.stack.lab
 vdc leaf01 id 1
   limit-resource vlan minimum 16 maximum 4094
   limit-resource vrf minimum 2 maximum 4096

scenarios/networking-lab/devstack-nxsw-vxlan/leaf02-poap.cfg

@@ -1,4 +1,4 @@
-hostname leaf02.netlab.example.com
+hostname leaf02.stack.lab
 vdc leaf02 id 1
   limit-resource vlan minimum 16 maximum 4094
   limit-resource vrf minimum 2 maximum 4096

scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2

@@ -29,7 +29,7 @@ PUBLIC_NETWORK_GATEWAY=172.20.200.1
 IP_VERSION=4
 
 # Enable Neutron with OVN
-enable_plugin neutron https://opendev.org/openstack/neutron
+NEUTRON_BRANCH=refs/changes/37/980637/1
 disable_service n-net
 enable_service q-svc
 # Disable traditional neutron agents
@@ -106,7 +106,7 @@ enable_plugin ironic https://opendev.org/openstack/ironic
 enable_plugin networking-generic-switch https://opendev.org/openstack/networking-generic-switch
 
 # Enable networking-baremetal plugin
-enable_plugin networking-baremetal https://opendev.org/openstack/networking-baremetal refs/changes/75/980375/2
+enable_plugin networking-baremetal https://opendev.org/openstack/networking-baremetal
 
 
 

scenarios/networking-lab/devstack-nxsw-vxlan/spine01-poap.cfg

@@ -1,4 +1,4 @@
-hostname spine01.netlab.example.com
+hostname spine01.stack.lab
 vdc spine01 id 1
   limit-resource vlan minimum 16 maximum 4094
   limit-resource vrf minimum 2 maximum 4096

scenarios/networking-lab/devstack-nxsw-vxlan/spine02-poap.cfg

@@ -1,4 +1,4 @@
-hostname spine02.netlab.example.com
+hostname spine02.stack.lab
 vdc spine02 id 1
   limit-resource vlan minimum 16 maximum 4094
   limit-resource vrf minimum 2 maximum 4096