Add SKMO OVN Octavia Tempest support for leaf region

Add EDPM recreate hook and extend network-values templates for Octavia
NAD generation. Leaf-region Tempest config lives in ci-framework-jobs
05-tests.yaml; reproducer uses post_tests: [] like the uni job.

Depends-On: openstack-k8s-operators/architecture#759

Signed-off-by: Ade Lee <alee@redhat.com>
Assisted-by: Claude Opus 4.6

Author: vakwetu

hooks/playbooks/skmo/recreate-edpm-deployment-if-stale.yaml

@@ -0,0 +1,46 @@
+---
+# Delete OpenStackDataPlaneDeployment when NodeSet config drifted.
+# After status.deployed=true the deployment controller does not re-run ansible
+# until the CR is recreated, even if osdpns configHash changed.
+- name: Recreate stale EDPM deployments when NodeSet config changed
+  hosts: "{{ cifmw_target_hook_host | default('localhost') }}"
+  gather_facts: false
+  vars:
+    skmo_edpm_targets:
+      - namespace: openstack
+        nodeset: openstack-edpm
+        deployment: edpm-deployment
+      - namespace: openstack2
+        nodeset: openstack-edpm
+        deployment: edpm-deployment
+  tasks:
+    - name: Recreate stale EDPM deployment in {{ target.namespace }}
+      vars:
+        target: "{{ item }}"
+      loop: "{{ skmo_edpm_targets }}"
+      loop_control:
+        label: "{{ item.namespace }}"
+      block:
+        - name: Read NodeSet status
+          kubernetes.core.k8s_info:
+            api_version: dataplane.openstack.org/v1beta1
+            kind: OpenStackDataPlaneNodeSet
+            name: "{{ target.nodeset }}"
+            namespace: "{{ target.namespace }}"
+          register: _osdpns
+
+        - name: Delete stale OpenStackDataPlaneDeployment
+          kubernetes.core.k8s:
+            state: absent
+            api_version: dataplane.openstack.org/v1beta1
+            kind: OpenStackDataPlaneDeployment
+            name: "{{ target.deployment }}"
+            namespace: "{{ target.namespace }}"
+            wait: true
+            wait_timeout: 600
+          when:
+            - _osdpns.resources | length > 0
+            - _osdpns.resources[0].status.configHash is defined
+            - _osdpns.resources[0].status.configHash | length > 0
+            - _osdpns.resources[0].status.deployedConfigHash is not defined or
+              _osdpns.resources[0].status.configHash != _osdpns.resources[0].status.deployedConfigHash

roles/ci_gen_kustomize_values/templates/multi-namespace/network-values/values.yaml.j2

@@ -124,3 +124,32 @@ data:
 
   lbServiceType: LoadBalancer
   storageClass: {{ cifmw_ci_gen_kustomize_values_storage_class }}
+
+  # Required when SKMO enables dt/osasinfra/nncp (octavia NNCP component)
+  bridgeName: ospbr
+{% if cifmw_architecture_scenario == 'multi-namespace-skmo' %}
+  octavia:
+    dnsDomain: octavia.example.com
+    mtu: 1500
+    vlan: 23
+    base_iface: enp7s0
+    net-attach-def: |
+      {
+        "cniVersion": "0.3.1",
+        "name": "octavia",
+        "type": "bridge",
+        "bridge": "octbr",
+        "ipam": {
+          "type": "whereabouts",
+          "range": "172.23.0.0/24",
+          "range_start": "172.23.0.30",
+          "range_end": "172.23.0.70",
+          "routes": [
+            {
+              "dst": "172.24.0.0/16",
+              "gw": "172.23.0.150"
+            }
+          ]
+        }
+      }
+{% endif %}

roles/ci_gen_kustomize_values/templates/multi-namespace/network-values2/values.yaml.j2

@@ -32,7 +32,7 @@ data:
 {%   endif %}
 {% endfor %}
 
-{% for network in cifmw_networking_env_definition.networks.values() if "2" in network %}
+{% for network in cifmw_networking_env_definition.networks.values() if "2" in network.network_name %}
 {% set ns.lb_tools = {} %}
   {{ network.network_name | replace("2", "") }}:
     dnsDomain: {{ network.search_domain }}
@@ -53,7 +53,7 @@ data:
         gateway: {{ network[_ipv.gw_vX] }}
 {%    endif %}
         name: subnet1
-{%    if network.vlan_id is defined  %}
+{%    if network.vlan_id is defined and network.network_name != 'external2' %}
         vlan: {{ network.vlan_id }}
 {%    endif %}
 {%    if ns.lb_tools | length > 0 %}
@@ -134,3 +134,31 @@ data:
 
   lbServiceType: LoadBalancer
   storageClass: {{ cifmw_ci_gen_kustomize_values_storage_class }}
+
+  bridgeName: ospbr
+{% if cifmw_architecture_scenario == 'multi-namespace-skmo' %}
+  octavia:
+    dnsDomain: octavia.example.com
+    mtu: 1500
+    vlan: 23
+    base_iface: enp7s0
+    net-attach-def: |
+      {
+        "cniVersion": "0.3.1",
+        "name": "octavia",
+        "type": "bridge",
+        "bridge": "octbr",
+        "ipam": {
+          "type": "whereabouts",
+          "range": "172.23.0.0/24",
+          "range_start": "172.23.0.30",
+          "range_end": "172.23.0.70",
+          "routes": [
+            {
+              "dst": "172.24.0.0/16",
+              "gw": "172.23.0.150"
+            }
+          ]
+        }
+      }
+{% endif %}

scenarios/reproducers/va-multi-skmo.yml

@@ -319,8 +319,25 @@ cifmw_networking_definition:
           ranges:
             - start: 100
               end: 250
-      vlan: 32
+      # No vlan: existing leaf NetConfig external subnet was created without VLAN;
+      # NetConfig webhook rejects adding vlan to an established subnet.
+      mtu: 1500
+    octavia:
+      network: "172.23.0.0/24"
+      vlan: 23
       mtu: 1500
+      tools:
+        multus:
+          ranges:
+            - start: 30
+              end: 70
+          routes:
+            - destination: "172.24.0.0/16"
+              gateway: "172.23.0.150"
+        netconfig:
+          ranges:
+            - start: 100
+              end: 250
 
   group-templates:
     ocps:
@@ -362,6 +379,8 @@ cifmw_networking_definition:
           trunk-parent: ctlplane
         storage:
           trunk-parent: ctlplane
+        octavia:
+          trunk-parent: ctlplane
     compute2s:
       network-template:
         range:
@@ -375,6 +394,8 @@ cifmw_networking_definition:
           trunk-parent: ctlplane2
         storage2:
           trunk-parent: ctlplane2
+        octavia:
+          trunk-parent: ctlplane2
   instances:
     controller-0:
       networks:
@@ -403,10 +424,7 @@ pre_admin_setup:
       cifmw_os_net_setup_public_end: "192.168.133.250"
       cifmw_os_net_setup_public_gateway: "192.168.133.1"
 
-post_tests:
-  - name: Run tempest against openstack2 namespace
-    type: playbook
-    source: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/ci-framework/playbooks/multi-namespace/ns2_validation.yaml"
-    extra_vars:
-      cifmw_test_operator_tempest_name: tempest-tests2
-      cifmw_test_operator_namespace: openstack2
+# Tempest runs via ci-framework-jobs scenario vars (05-tests.yaml), not post_tests hooks.
+# Zuul: integration-uni-base variable_files_dirs loads scenarios/uni/va-multi-namespace-skmo/.
+# Local reproducer: pass -e @.../ci-framework-jobs/scenarios/uni/va-multi-namespace-skmo/05-tests.yaml
+post_tests: []