Skip to content
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.

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

Use default single-nic-vlans.j2 #560

Conversation

bshephar
Copy link
Contributor

@bshephar bshephar commented Sep 15, 2023

We have removed the bespoke API interface used to override nic-config files in favor or the direct Ansible variable. This change ensures that we don't remove the variable from the template, which is currently using the standard single-nic-vlans.j2 file:
https://github.com/openstack-k8s-operators/dataplane-operator/pull/394/files
openstack-k8s-operators/edpm-ansible#243

As a pull request owner and reviewers, I checked that:

  • Appropriate testing is done and actually running
  • Appropriate documentation exists and/or is up-to-date:
    • README in the role
    • Content of the docs/source is reflecting the changes

@softwarefactory-project-zuul
Copy link

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://review.rdoproject.org/zuul/buildset/73e5400d53c74af0bbbb3308b7966a0a

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 32m 02s
podified-multinode-edpm-deployment-crc RETRY_LIMIT in 1h 19m 26s
✔️ noop SUCCESS in 0s
✔️ podified-multinode-edpm-e2e-nobuild-tagged-crc SUCCESS in 39m 13s

@softwarefactory-project-zuul
Copy link

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://review.rdoproject.org/zuul/buildset/817396e640d441b891a3940c57ab07f4

Warning:
Dependency cycle detected

@pablintino
Copy link
Collaborator

@bshephar Ok I see, the change that removes it from install_yamls and the dataplane is not yet in, just ping me when you need this one in.

@cjeanner
Copy link
Collaborator

Maybe using Depends-On may help testing things up?

@bshephar bshephar force-pushed the remove-networkconfig branch 2 times, most recently from 0c6fd83 to 0e18c87 Compare September 18, 2023 15:14
@softwarefactory-project-zuul
Copy link

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://review.rdoproject.org/zuul/buildset/445d114db6534b678aa1193d69fdc6b3

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 30m 59s
podified-multinode-edpm-deployment-crc FAILURE in 1h 17m 28s
✔️ noop SUCCESS in 0s
✔️ podified-multinode-edpm-e2e-nobuild-tagged-crc SUCCESS in 37m 07s

@bshephar
Copy link
Contributor Author

Maybe using Depends-On may help testing things up?

I have the Depends-On for the dataplane-operator PR so that it Depends-On this PR:
openstack-k8s-operators/dataplane-operator#394

Do you think it should be the other way around?

@bshephar
Copy link
Contributor Author

recheck

@bshephar
Copy link
Contributor Author

Ops, wrong PR to recheck. My bad.

bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 19, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#341
Depends-On: openstack-k8s-operators/ci-framework#560
Signed-off-by: Brendan Shephard <[email protected]>
@softwarefactory-project-zuul
Copy link

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://review.rdoproject.org/zuul/buildset/84f71ea192c341d9b17a03571d137834

✔️ openstack-k8s-operators-content-provider SUCCESS in 50m 18s
podified-multinode-edpm-deployment-crc FAILURE in 36m 57s
✔️ noop SUCCESS in 0s
✔️ podified-multinode-edpm-e2e-nobuild-tagged-crc SUCCESS in 37m 04s

@bshephar bshephar force-pushed the remove-networkconfig branch from 0e18c87 to 989893b Compare September 19, 2023 02:57
@softwarefactory-project-zuul
Copy link

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://review.rdoproject.org/zuul/buildset/6a4d1d8ba4514957a5687bc03c7e528f

✔️ openstack-k8s-operators-content-provider SUCCESS in 48m 46s
podified-multinode-edpm-deployment-crc FAILURE in 35m 43s
✔️ noop SUCCESS in 0s
✔️ podified-multinode-edpm-e2e-nobuild-tagged-crc SUCCESS in 37m 39s

@cjeanner cjeanner mentioned this pull request Sep 19, 2023
4 tasks
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 21, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#341
Depends-On: openstack-k8s-operators/ci-framework#560
Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 21, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#341
Depends-On: openstack-k8s-operators/ci-framework#560
Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 21, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#341
Depends-On: openstack-k8s-operators/ci-framework#560
Signed-off-by: Brendan Shephard <[email protected]>
We have removed the bespoke API interface used to override nic-config
files in favor or the direct Ansible variable. This change ensures that
we don't remove the variable from the template, which is currently using
the standard single-nic-vlans.j2 file:
https://github.com/openstack-k8s-operators/dataplane-operator/pull/394/files
openstack-k8s-operators/edpm-ansible#243

Signed-off-by: Brendan Shephard <[email protected]>
@bshephar bshephar force-pushed the remove-networkconfig branch from 989893b to 2eed4b1 Compare September 21, 2023 03:54
@pablintino
Copy link
Collaborator

/approve
/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pablintino

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 21, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#341
Depends-On: openstack-k8s-operators/ci-framework#560
Signed-off-by: Brendan Shephard <[email protected]>
bshephar added a commit to bshephar/dataplane-operator that referenced this pull request Sep 21, 2023
This change removes the CRD level override for network config files.
Instead, this allows us to use the Ansible variable directly to set any
require network config customizations.

Depends-On: openstack-k8s-operators/edpm-ansible#341
Depends-On: openstack-k8s-operators/ci-framework#560
Signed-off-by: Brendan Shephard <[email protected]>
@openshift-merge-robot openshift-merge-robot merged commit 6f6d85b into openstack-k8s-operators:main Sep 21, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants