Skip to content

feat(neutron-understack): Reconcile orphaned netdev-router Ironic nodes (release nodes whose instance_uuid has no live router) #2370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nidzrai wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(neutron-understack): Reconcile orphaned netdev-router Ironic nodes (release nodes whose instance_uuid has no live router) #2370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01e3aba
test
nidzrai Sep 21, 2026
0c56a90
reconcile orphaned netdev router nodes
nidzrai Sep 21, 2026
19bc681
DEV Testing only
nidzrai Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions components/images-openstack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,20 @@ images:
ironic_retrive_swift_config: "ghcr.io/rackerlabs/understack/openstack-client:2025.2"

# neutron
neutron_db_sync: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_dhcp: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_l3: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_l2gw: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_linuxbridge_agent: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_metadata: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_ovn_metadata: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_openvswitch_agent: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_server: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_rpc_server: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_ovn_maintenance_worker: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_bagpipe_bgp: "ghcr.io/rackerlabs/understack/neutron:2026.1"
neutron_netns_cleanup_cron: "ghcr.io/rackerlabs/understack/neutron:2026.1"
# DEV-TEST ONLY: pinned to pr-2370 for the netdev-router reconciler.
neutron_db_sync: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_dhcp: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_l3: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_l2gw: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_linuxbridge_agent: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_metadata: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_ovn_metadata: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_openvswitch_agent: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_server: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_rpc_server: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_ovn_maintenance_worker: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_bagpipe_bgp: "ghcr.io/rackerlabs/understack/neutron:pr-2370"
neutron_netns_cleanup_cron: "ghcr.io/rackerlabs/understack/neutron:pr-2370"

# nova
nova_api: "ghcr.io/rackerlabs/understack/nova:2026.1"
Expand Down
45 changes: 45 additions & 0 deletions python/neutron-understack/neutron_understack/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
_OPT_GRP_IRONIC = "ironic"
_OPT_GRP_L3_SVC_CISCO_ASA = "l3_service_cisco_asa"
_OPT_GRP_UNDERSTACK_VNI = "understack_vni"
_OPT_GRP_NETDEV_RECONCILE = "netdev_router_reconcile"

_mech_understack_opts = [
cfg.StrOpt(
Expand Down Expand Up @@ -69,6 +70,40 @@
]


_netdev_reconcile_opts = [
cfg.BoolOpt(
"enabled",
default=True,
help=(
"Run the periodic netdev-router reconciler in the OVN maintenance "
"worker. It releases netdev Ironic nodes whose instance_uuid names "
"a router that no longer exists. Set to false to stop it from "
"changing any node state."
),
),
cfg.BoolOpt(
"dry_run",
default=False,
help=(
"Log the netdev nodes the reconciler would release without "
"releasing them. Use this to confirm the candidate set in a new "
"region before letting it act."
),
),
cfg.BoolOpt(
"include_legacy_unmarked",
default=False,
help=(
"Also reconcile associated netdev nodes created before the "
"understack_router_id ownership marker existed. Enable this only "
"after dry-run confirms that every unmarked candidate belongs to "
"the Neutron router workflow; netdev is shared by other network "
"appliance types."
),
),
]


def list_understack_opts():
return [
(_OPT_GRP_ML2_UNDERSTACK, _mech_understack_opts),
Expand Down Expand Up @@ -100,6 +135,12 @@ def list_understack_vni_opts():
]


def list_netdev_reconcile_opts():
return [
(_OPT_GRP_NETDEV_RECONCILE, _netdev_reconcile_opts),
]


def register_ml2_understack_opts(config):
config.register_opts(_mech_understack_opts, _OPT_GRP_ML2_UNDERSTACK)

Expand All @@ -118,6 +159,10 @@ def register_understack_vni_opts(config):
config.register_opts(_understack_vni_opts, _OPT_GRP_UNDERSTACK_VNI)


def register_netdev_reconcile_opts(config):
config.register_opts(_netdev_reconcile_opts, _OPT_GRP_NETDEV_RECONCILE)


def get_session(group: str) -> ks_session.Session:
auth = ks_loading.load_auth_from_conf_options(cfg.CONF, group)
session = ks_loading.load_session_from_conf_options(cfg.CONF, group, auth=auth)
Expand Down
Loading
Loading