Skip to content

Comments

Backport Cisco ACI CNI changes for OpenShift Version 4.20 on OpenStack#231

Merged
maheshkurund merged 20 commits intokmr2-release-4.20from
aci-cni-kmr2-release-4.20
Jan 19, 2026
Merged

Backport Cisco ACI CNI changes for OpenShift Version 4.20 on OpenStack#231
maheshkurund merged 20 commits intokmr2-release-4.20from
aci-cni-kmr2-release-4.20

Conversation

@allenantony-oc
Copy link
Collaborator

No description provided.

PariyaAshok and others added 20 commits December 9, 2025 06:58
(cherry picked from commit 87f0ac7)
(cherry picked from commit e550e4c)
(cherry picked from commit d18ad8d)
(cherry picked from commit 134fb6a)
(cherry picked from commit 2429983)
(cherry picked from commit 6952d68)
(cherry picked from commit 8b7f4cb)
(cherry picked from commit 28ce764)
(cherry picked from commit b339848)
(cherry picked from commit b1dfabd)
…lso template to create snatpolicy

(cherry picked from commit d9d40b8)
(cherry picked from commit 1f9c56a)
(cherry picked from commit d54cb8d)
(cherry picked from commit 5ac4349)
(cherry picked from commit 27d4751)
(cherry picked from commit 46e62f0)
(cherry picked from commit 4783e17)
(cherry picked from commit f056212)
(cherry picked from commit 40209eb)
(cherry picked from commit 78647ea)
(cherry picked from commit 75f3e99)
(cherry picked from commit 91be7e2)
(cherry picked from commit 5bad89b)
(cherry picked from commit 6b669f7)
(cherry picked from commit 896ec35)
(cherry picked from commit 4a5dff2)
(cherry picked from commit fca7df6)
(cherry picked from commit f9f457a)
1. Remove "Create the cluster IPv6 subnet" wth os_subnet6 field
2. Remove security_groups addition during api/ingress port creation.
   This is being handled in update-network-resources.yaml

(cherry picked from commit 6963d79)
format got changed.

(cherry picked from commit ef04c15)
…e name"

This reverts commit ee237a5.

(cherry picked from commit 35f8f25)
… values

Changes to
1. node interface
2. opflex interface

(cherry picked from commit fcb0c11)
Current changes ended up running both ext-rtr  and dualstack rtr
in case where os_subnet_range6 is defined. Current openshift on openstack
doesn't support IPV6 dualstack and this os_subnet6_range should
be disabled in inventory.yaml as such only one role for creating
external router should run

(cherry picked from commit af872fa)
- Updated default interface names for node and opflex interfaces which we observe in OSP17.1.
- Fixed variable reference issue from in networkscripts template files.

(cherry picked from commit 84a9b67)
Added script that configures the manifests corresponds to control
plane machines and machine set. This allows CPMS resource creation
to manage control plane nodes.

(cherry picked from commit a7af9aa)
Copy link
Collaborator

@maheshkurund maheshkurund left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@maheshkurund maheshkurund merged commit 1bd52da into kmr2-release-4.20 Jan 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants