Add multus_type to cifmw_networking_env_definition variable #2816

evallesp · 2025-03-21T09:48:58Z

We now can select the multus_type between "bridge" and macvlan"
so ci_multus would render each NetworkAttachmentDefinition appropiate
without the assumption that each NAD has the same multus type defined at
cifmw_ci_multus_default_nad_type.

For a given NAD, if there's no multus_type variable, then it'd take
(as previously) the default one.

For adding the multus_type to cifmw_networking_env_definition we need to add
the argument "type" for the input of networking_mapper.

danpawlik

Just change commit message and would be good ;)

softwarefactory-project-zuul · 2025-03-21T15:36:40Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/eca194b7b9ac40a388841ed3a32e1b19

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 41m 22s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 25m 04s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 18m 51s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 46s
❌ cifmw-pod-pre-commit FAILURE in 7m 31s
✔️ build-push-container-cifmw-client SUCCESS in 20m 42s
✔️ cifmw-molecule-ci_multus SUCCESS in 15m 12s
❌ cifmw-molecule-libvirt_manager FAILURE in 10m 13s
❌ cifmw-molecule-networking_mapper FAILURE in 5m 09s
❌ cifmw-molecule-reproducer FAILURE in 8m 12s

openshift-ci · 2025-03-25T10:05:38Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

softwarefactory-project-zuul · 2025-03-25T12:33:00Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/4d4091cfd8da4ea6a3155150d1d83049

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 48m 34s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 10m 52s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 25m 17s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 30s
❌ cifmw-pod-pre-commit FAILURE in 7m 46s
✔️ build-push-container-cifmw-client SUCCESS in 20m 41s
✔️ cifmw-molecule-ci_multus SUCCESS in 13m 12s
❌ cifmw-molecule-libvirt_manager FAILURE in 10m 36s
❌ cifmw-molecule-networking_mapper FAILURE in 5m 21s
❌ cifmw-molecule-reproducer FAILURE in 7m 19s

Swtich the scenario to scenarios/centos-9/ironic.yml Update hooks/playbooks/control_plane_ironic.yml to include kustomization patches to configure ironic and Nova Cell with computeDriver: ironic.IronicDriver Depends-On: openstack-k8s-operators/install_yamls#969 Depends-On: openstack-k8s-operators#2816 Conflicts: zuul.d/projects.yaml

Swtich the scenario to scenarios/centos-9/ironic.yml Update hooks/playbooks/control_plane_ironic.yml to include kustomization patches to configure ironic and Nova Cell with computeDriver: ironic.IronicDriver Depends-On: openstack-k8s-operators#2816 Conflicts: zuul.d/projects.yaml

Swtich the scenario to scenarios/centos-9/ironic.yml Update hooks/playbooks/control_plane_ironic.yml to include kustomization patches to configure ironic and Nova Cell with computeDriver: ironic.IronicDriver Depends-On: openstack-k8s-operators#2816 Conflicts: zuul.d/projects.yaml hooks/playbooks/control_plane_ironic.yml

evallesp · 2025-04-08T12:49:21Z

recheck

softwarefactory-project-zuul · 2025-04-08T13:52:56Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/5f25172d9dad4b7d95b3a72369a58a2e

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 43m 24s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 07m 53s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 29m 19s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 01s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 06s
✔️ build-push-container-cifmw-client SUCCESS in 21m 40s
❌ cifmw-molecule-ci_multus FAILURE in 27m 27s

evallesp · 2025-04-08T14:09:39Z

recheck

softwarefactory-project-zuul · 2025-04-08T14:36:58Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/9a8f17790bc44ba78f33c85505032618

✔️ openstack-k8s-operators-content-provider SUCCESS in 26m 03s
❌ podified-multinode-edpm-deployment-crc RETRY_LIMIT in 11m 58s
❌ cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 2m 04s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 40s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 00s
❌ build-push-container-cifmw-client RETRY_LIMIT in 1m 41s
❌ cifmw-molecule-ci_multus FAILURE in 25m 27s

plugins/module_utils/net_map/networking_definition.py

plugins/module_utils/net_map/networking_mapper.py

roles/ci_multus/README.md

roles/ci_multus/molecule/default/converge.yml

roles/ci_multus/molecule/default/nads_output.yml

roles/ci_multus/templates/nad.yml.j2

roles/networking_mapper/molecule/default/converge.yml

plugins/module_utils/net_map/networking_definition.py

plugins/module_utils/net_map/networking_mapper.py

roles/ci_multus/README.md

roles/ci_multus/molecule/default/verify_crc.yml

roles/ci_multus/templates/nad.yml.j2

We now can select the multus_type between "bridge" and macvlan" so ci_multus would render each NetworkAttachmentDefinition appropiate without the assumption that each NAD has the same multus type defined at cifmw_ci_multus_default_nad_type. For a given NAD, if there's no multus_type variable, then it'd take (as previously) the default one. For adding the multus_type to cifmw_networking_env_definition we need to add the argument "type" for the input of networking_mapper.

github-actions · 2025-05-11T03:05:32Z

This PR is stale because it has been for over 15 days with no activity.
Remove stale label or comment or this will be closed in 7 days.

dasm · 2025-05-12T16:09:13Z

@evallesp I'd love to merge the change. Do you have a testproject to verify this functionality?

evallesp · 2025-05-14T07:56:36Z

@evallesp I'd love to merge the change. Do you have a testproject to verify this functionality?

We have tested this in podified-multinode-edpm-deployment-crc github-check, but @hjensas has #2524 and I want to hold on until that one is green.

Moving this back to DNM.

evallesp · 2025-05-22T10:39:26Z

hi @dasm could you check again: in conjuction with: #2987 We've checked that multus_type and multus_attach are working as expected:

Now we can set several NADS where each of one can be bridge and macvlan, also we can select if the bridge multus plugin can be attached to the network name (used for attach to linux-bridge) or interface name (When it's attached directly to the interface port)

This can be checked at: https://logserver.rdoproject.org/599/rdoproject.org/5998c66ff82441258d8fde8e176d5286/controller/ci-framework-data/logs/openstack-k8s-operators-openstack-must-gather/namespaces/openstack/nad.log

apiVersion: v1
items:

apiVersion: k8s.cni.cncf.io/v1
kind: NetworkAttachmentDefinition
metadata:
.
.
.
spec:
config: |-
{
"cniVersion": "0.3.1",
"name": "baremetal",
"type": "bridge",
"bridge": "baremetal",
"ipam": {
"type": "whereabouts",
"range": "172.20.1.0/24",
"range_start": "172.20.1.30",
"range_end": "172.20.1.70"
}
}
apiVersion: k8s.cni.cncf.io/v1
kind: NetworkAttachmentDefinition
metadata:
.
.
.
spec:
config: |
{
"cniVersion": "0.3.1",
"name": "ctlplane",
"type": "macvlan",
"master": "ospbr",
"ipam": {
"type": "whereabouts",
"range": "192.168.122.0/24",
"range_start": "192.168.122.30",
"range_end": "192.168.122.70"
}
}

github-actions · 2025-06-07T03:03:43Z

This PR is stale because it has been for over 15 days with no activity.
Remove stale label or comment or this will be closed in 7 days.

evallesp requested a review from a team as a code owner March 21, 2025 09:48

evallesp mentioned this pull request Mar 21, 2025

WIP: crc-bootstrap-staging-ironic #2524

Closed

evallesp changed the title ~~DNM~~ Check bridge with network name Mar 21, 2025

github-actions bot added the Ready For Review label Mar 21, 2025

evallesp force-pushed the bridge-name-as-network-name branch from d8fe43c to bdd9a2c Compare March 21, 2025 12:54

github-actions bot removed the Ready For Review label Mar 21, 2025

danpawlik reviewed Mar 21, 2025

View reviewed changes

evallesp changed the title ~~Check bridge with network name~~ DNM Check bridge with network name Mar 21, 2025

evallesp force-pushed the bridge-name-as-network-name branch from bdd9a2c to 113aee0 Compare March 21, 2025 13:53

lewisdenny marked this pull request as draft March 23, 2025 23:44

openshift-ci bot added the do-not-merge/work-in-progress label Mar 23, 2025

evallesp force-pushed the bridge-name-as-network-name branch from 113aee0 to a0dec14 Compare March 25, 2025 10:05

evallesp force-pushed the bridge-name-as-network-name branch 2 times, most recently from c497149 to b48f41b Compare March 25, 2025 10:42

evallesp force-pushed the bridge-name-as-network-name branch from b48f41b to 9164234 Compare April 8, 2025 08:38

evallesp mentioned this pull request Apr 8, 2025

DNM crc-bootstrap-staging-ironic #2879

Closed

evallesp force-pushed the bridge-name-as-network-name branch 2 times, most recently from ae331fa to 179c625 Compare April 8, 2025 10:28

evallesp force-pushed the bridge-name-as-network-name branch 2 times, most recently from af1c269 to a619b47 Compare April 8, 2025 12:08

evallesp commented Apr 15, 2025

View reviewed changes

evallesp marked this pull request as ready for review April 15, 2025 10:09

openshift-ci bot removed the do-not-merge/work-in-progress label Apr 15, 2025

github-actions bot added the Ready For Review label Apr 15, 2025

evallesp commented Apr 15, 2025

View reviewed changes

plugins/module_utils/net_map/networking_definition.py Show resolved Hide resolved

evallesp commented Apr 15, 2025

View reviewed changes

plugins/module_utils/net_map/networking_mapper.py Show resolved Hide resolved

danpawlik reviewed Apr 15, 2025

View reviewed changes

roles/ci_multus/README.md Show resolved Hide resolved

danpawlik reviewed Apr 15, 2025

View reviewed changes

roles/ci_multus/molecule/default/verify_crc.yml Show resolved Hide resolved

danpawlik reviewed Apr 15, 2025

View reviewed changes

roles/ci_multus/templates/nad.yml.j2 Show resolved Hide resolved

evallesp force-pushed the bridge-name-as-network-name branch from 5c09cf3 to 0e44750 Compare April 21, 2025 09:19

github-actions bot added Ready For Review and removed Ready For Review labels Apr 21, 2025

frenzyfriday approved these changes Apr 25, 2025

View reviewed changes

github-actions bot added the Stale label May 11, 2025

danpawlik approved these changes May 12, 2025

View reviewed changes

github-actions bot removed the Stale label May 13, 2025

evallesp changed the title ~~Add multus_type to cifmw_networking_env_definition variable~~ DNM: Add multus_type to cifmw_networking_env_definition variable May 14, 2025

evallesp added the do-not-merge/work-in-progress label May 14, 2025

evallesp removed the do-not-merge/work-in-progress label May 22, 2025

evallesp changed the title ~~DNM: Add multus_type to cifmw_networking_env_definition variable~~ Add multus_type to cifmw_networking_env_definition variable May 22, 2025

github-actions bot added the Stale label Jun 7, 2025

evallesp removed the Stale label Jun 9, 2025

bshewale approved these changes Jun 20, 2025

View reviewed changes

bshewale merged commit 88bb724 into openstack-k8s-operators:main Jun 20, 2025
9 of 10 checks passed

Add multus_type to cifmw_networking_env_definition variable #2816

Add multus_type to cifmw_networking_env_definition variable #2816

Uh oh!

Conversation

evallesp commented Mar 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

danpawlik left a comment

Choose a reason for hiding this comment

Uh oh!

softwarefactory-project-zuul bot commented Mar 21, 2025

Uh oh!

openshift-ci bot commented Mar 25, 2025

Uh oh!

softwarefactory-project-zuul bot commented Mar 25, 2025

Uh oh!

evallesp commented Apr 8, 2025

Uh oh!

softwarefactory-project-zuul bot commented Apr 8, 2025

Uh oh!

evallesp commented Apr 8, 2025

Uh oh!

softwarefactory-project-zuul bot commented Apr 8, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented May 11, 2025

Uh oh!

dasm commented May 12, 2025

Uh oh!

evallesp commented May 14, 2025

Uh oh!

evallesp commented May 22, 2025

Uh oh!

github-actions bot commented Jun 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

evallesp commented Mar 21, 2025 •

edited

Loading