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

Add templating support for nmstate defined networking configuration #249

Merged
merged 1 commit into from
Nov 1, 2023

Conversation

rebtoor
Copy link
Contributor

@rebtoor rebtoor commented Jul 28, 2023

  • Fixed nmstate molecule scenario for edpm_network_config role

@softwarefactory-project-zuul
Copy link

@rebtoor
Copy link
Contributor Author

rebtoor commented Jul 28, 2023

it's useless to "recheck" the CI, job is already passed on baremetal.

@softwarefactory-project-zuul
Copy link

@rebtoor
Copy link
Contributor Author

rebtoor commented Aug 1, 2023

recheck

@softwarefactory-project-zuul
Copy link

@softwarefactory-project-zuul
Copy link

@@ -40,5 +40,6 @@ edpm_network_config_os_net_config_mappings: {}
edpm_network_config_safe_defaults: true
edpm_network_config_with_ansible: true
edpm_network_config_template: templates/single_nic_vlans/single_nic_vlans.j2
edpm_network_config_nmstate_template: templates/system_role_nmstate/single_nic_vlans.j2
Copy link
Contributor

Choose a reason for hiding this comment

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

Rather than making this a file path, which is only really useful for CI can we do a similar thing to this PR?
#243

So instead of having a template file, we can in-line the yaml which will work better for the dataplane-operator CRD interface?

Like this:
https://github.com/openstack-k8s-operators/edpm-ansible/pull/243/files#diff-89da6e02d8fbed04de229b13205144afd3d4bcedda05167972c6badac58102b1R21

Which means the Dataplane operator CRD interface would look like:
https://github.com/openstack-k8s-operators/dataplane-operator/pull/318/files#diff-7c43891912d609cdc0e86a9cb67c44e43264d6e6463d9afa2726a1292cf749caR57-R90

Since users can't realistically use a filepath template file.

Copy link
Contributor

Choose a reason for hiding this comment

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

I should have read the conversation history before my comment. I see this was discussed above too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I modified the role following your PRs examples. I also drop edpm_network_config_nmstate_template (re)using edpm_network_config_template var because otherwise we should handle this case here: https://github.com/openstack-k8s-operators/dataplane-operator/pull/284/files#diff-874aae70e738f15dc1bf30750cee0e87e3278c5c02d37e35c0943ca6c29393bb

@rebtoor
Copy link
Contributor Author

rebtoor commented Aug 3, 2023

/hold

we need to understand if we want to go on with the path described in: #243

@softwarefactory-project-zuul
Copy link

This change depends on a change that failed to merge.

Change openstack-k8s-operators/dataplane-operator#284 is needed.

@rebtoor
Copy link
Contributor Author

rebtoor commented Oct 27, 2023

/unhold

* Fixed `nmstate` molecule scenario for `edpm_network_config` role

Signed-off-by: Roberto Alfieri <[email protected]>
Copy link
Contributor

openshift-ci bot commented Nov 1, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rebtoor, slagle

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

@openshift-ci openshift-ci bot merged commit 9323b53 into openstack-k8s-operators:main Nov 1, 2023
27 checks 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.

6 participants