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.

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

Jump to bottom

Add edpm role to deploy Neutron DHCP agent #375

Merged
merged 2 commits into from
Oct 3, 2023
Merged

Add edpm role to deploy Neutron DHCP agent #375

merged 2 commits into from
Oct 3, 2023

Conversation

slawqo
Copy link
Contributor

@slawqo slawqo commented Sep 27, 2023 •
edited by openshift-ci bot
Loading

This new roles deploys, configures and runs neutron-dhcp-agent on the EDPM node if needed.

Jira: OSP-27538

@openshift-ci openshift-ci bot requested review from abays and bshephar September 27, 2023 09:47
@softwarefactory-project-zuul
Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/edpm-ansible for 375,a0e53afb9317a4029c65c8312990cfa4448e999f

@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/78994494bc30456397948b74c3482006

✔️ openstack-k8s-operators-content-provider SUCCESS in 42m 41s
❌ podified-multinode-edpm-deployment-crc RETRY_LIMIT in 8m 33s
✔️ edpm-ansible-molecule-edpm_podman SUCCESS in 5m 43s
✔️ edpm-ansible-molecule-edpm_module_load SUCCESS in 4m 55s
✔️ edpm-ansible-molecule-edpm_kernel SUCCESS in 11m 51s
✔️ edpm-ansible-molecule-edpm_libvirt SUCCESS in 6m 53s
✔️ edpm-ansible-molecule-edpm_nova SUCCESS in 7m 40s

@slawqo
Copy link
Contributor Author

slawqo commented Sep 27, 2023

recheck

booxter
booxter requested changes Sep 28, 2023
View reviewed changes
Copy link
Contributor

@booxter booxter left a comment

Choose a reason for hiding this comment

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

Please enable the molecule task in CI for the new role. I think it will reveal a number of issues in the PR.

roles/edpm_neutron_dhcp/defaults/main.yml Outdated Show resolved Hide resolved
roles/edpm_neutron_dhcp/defaults/main.yml Outdated Show resolved Hide resolved
roles/edpm_neutron_dhcp/defaults/main.yml Outdated Show resolved Hide resolved
roles/edpm_neutron_dhcp/meta/argument_specs.yml Outdated Show resolved Hide resolved
roles/edpm_neutron_dhcp/molecule/default/verify.yml Outdated Show resolved Hide resolved
roles/edpm_neutron_dhcp/defaults/main.yml Outdated Show resolved Hide resolved
roles/edpm_neutron_dhcp/templates/neutron.conf.j2 Outdated Show resolved Hide resolved
roles/edpm_neutron_dhcp/vars/main.yml Outdated Show resolved Hide resolved
@slawqo
Add edpm role to deploy Neutron DHCP agent
d1507ca 
This new roles deploys, configures and runs neutron-dhcp-agent on the
EDPM node if needed.

Jira: OSP-27538
@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/099fc0b830694184baba79bd65f45043

✔️ openstack-k8s-operators-content-provider SUCCESS in 19m 49s
❌ podified-multinode-edpm-deployment-crc RETRY_LIMIT in 3m 01s
✔️ edpm-ansible-molecule-edpm_podman SUCCESS in 7m 42s
✔️ edpm-ansible-molecule-edpm_module_load SUCCESS in 6m 59s
✔️ edpm-ansible-molecule-edpm_kernel SUCCESS in 10m 43s
✔️ edpm-ansible-molecule-edpm_libvirt SUCCESS in 7m 43s
✔️ edpm-ansible-molecule-edpm_nova SUCCESS in 7m 29s

@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/c3f01bb8f1724e59b6bb7368737255b5

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 10m 57s
❌ podified-multinode-edpm-deployment-crc FAILURE in 57m 40s
✔️ edpm-ansible-molecule-edpm_podman SUCCESS in 6m 23s
✔️ edpm-ansible-molecule-edpm_module_load SUCCESS in 5m 42s
✔️ edpm-ansible-molecule-edpm_kernel SUCCESS in 11m 11s
✔️ edpm-ansible-molecule-edpm_libvirt SUCCESS in 6m 35s
✔️ edpm-ansible-molecule-edpm_nova SUCCESS in 6m 43s

@slawqo slawqo mentioned this pull request Oct 2, 2023
Merged
@slawqo
Copy link
Contributor Author

slawqo commented Oct 2, 2023

recheck

booxter
booxter reviewed Oct 2, 2023
View reviewed changes
roles/edpm_neutron_dhcp/OWNERS
@@ -0,0 +1,8 @@
# See the OWNERS docs at https://go.k8s.io/owners
approvers:
- slawqo
Copy link
Contributor

Choose a reason for hiding this comment

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

I actually think you could also add yourself to network-approvers list (separate PR). Just saying.

roles/edpm_neutron_dhcp/tasks/configure.yml
with_items:
- {"src": "neutron.conf.j2", "dest": "01-neutron.conf"}
- {"src": "rootwrap.conf.j2", "dest": "01-rootwrap.conf"}
- {"src": "neutron-dhcp-agent.conf.j2", "dest": "01-neutron-dhcp-agent.conf"}
Copy link
Contributor

Choose a reason for hiding this comment

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

(not exactly the problem with - just - your patch but I wonder if we should be explicit about the order of config files here - making sure that all CRD-derived configs are later in the loading order, by using a prefix of e.g. 02- vs. 01- used for the "EDP" config snippets. - but we can discuss it separately since I think this affects other roles too.)

roles/edpm_neutron_dhcp/tasks/install.yml
src: "neutron_dhcp_agent.yaml.j2"
dest: "/var/lib/openstack/config/containers/neutron_dhcp_agent.yaml"
setype: "container_file_t"
mode: 0644
Copy link
Contributor

Choose a reason for hiding this comment

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

I've heard modes should be put in quotes, "0644". Because apparently otherwise ansible may want to interpret them as numbers. (That's what I've heard. I haven't checked.)

@booxter
Copy link
Contributor

booxter commented Oct 2, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Oct 2, 2023
karelyatin
karelyatin approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@karelyatin karelyatin left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 3, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: karelyatin, slawqo

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 added the approved label Oct 3, 2023
@openshift-ci openshift-ci bot merged commit fc1fb80 into openstack-k8s-operators:main Oct 3, 2023
20 checks passed
@rebtoor rebtoor mentioned this pull request Oct 5, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@booxter booxter booxter requested changes

@karelyatin karelyatin karelyatin approved these changes

@abays abays Awaiting requested review from abays

@bshephar bshephar Awaiting requested review from bshephar

Assignees

@booxter booxter

@karelyatin karelyatin

Labels
approved lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@slawqo @booxter @karelyatin @openshift-merge-robot