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 support for RHOSP 18 Openstack EDPM deployment #3414

Merged
merged 1 commit into from
Nov 28, 2023

Conversation

rebtoor
Copy link
Contributor

@rebtoor rebtoor commented Nov 13, 2023

EDPM (External DataPlane Management) will be the new way to deploy compute nodes startin from RHOSP 18 which will replace TripleO/Director.

  • Added openstack_edpm plugin
  • Added custom path for config and logs in frr/libvirt/logrotate/openstack_neutron/openstack_nova/ovn_host modules
  • Tagged libvirt/openstack_neutron/openstack_nova/ovn_host modules as openstack_edpm_compute

Please place an 'X' inside each '[]' to confirm you adhere to our Contributor Guidelines

  • Is the commit message split over multiple lines and hard-wrapped at 72 characters?
  • Is the subject and message clear and concise?
  • [] Does the subject start with [plugin_name] if submitting a plugin patch or a [section_name] if part of the core sosreport code?
  • Does the commit contain a Signed-off-by: First Lastname [email protected]?
  • Are any related Issues or existing PRs properly referenced via a Closes (Issue) or Resolved (PR) line?

Copy link

Congratulations! One of the builds has completed. 🍾

You can install the built RPMs by following these steps:

  • sudo yum install -y dnf-plugins-core on RHEL 8
  • sudo dnf install -y dnf-plugins-core on Fedora
  • dnf copr enable packit/sosreport-sos-3414
  • And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

sos/report/plugins/libvirt.py Outdated Show resolved Hide resolved
sos/report/plugins/libvirt.py Outdated Show resolved Hide resolved
@rebtoor rebtoor force-pushed the osp18 branch 2 times, most recently from 2a0c3f3 to 6dfe375 Compare November 13, 2023 13:31
@rebtoor rebtoor requested a review from arif-ali November 13, 2023 13:33
@rebtoor rebtoor force-pushed the osp18 branch 3 times, most recently from a01dc92 to 350d2ed Compare November 13, 2023 15:13
"admin_password", "connection_password",
"memcache_secret_key", "s3_secret_key",
"metadata_proxy_shared_secret", "fixed_key", "transport_url",
"rbd_secret_uuid",
Copy link
Member

Choose a reason for hiding this comment

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

you could add the rbd_secret_uuid above instead. As it's a regex, it should just work

Comment on lines 93 to 111
class RedHatLibvirt(Libvirt, RedHatPlugin):

def setup(self):
super(RedHatLibvirt, self).setup()
self.add_copy_spec([
"/var/lib/openstack/config/libvirt",
"/var/lib/openstack/containers/libvirt*.json",
])

if not self.get_option("all_logs"):
self.add_copy_spec([
"/var/log/containers/qemu/*.log",
"/var/log/containers/libvirt/*.log",
])
else:
self.add_copy_spec([
"/var/log/containers/qemu/",
"/var/log/containers/libvirt/",
])
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need to split this out.

The /var/lib/openstack paths should, arguably, be collected by one of the openstack plugins. However, assuming we keep the collection in the libvirt plugin, we can simply add these to the existing collection lists. If they don't exist on a particular system, we skip them gracefully.

Further, the /var/log/containers paths fit nicely in with what is already called in the existing IndependentPlugin structure.

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 thought it was redundant to create an openstack_libvirt plugin since i would basically be copying most of this one, but i agree that we can avoid to split the logic. Let me fix it.

sos/report/plugins/openstack_edpm.py Outdated Show resolved Hide resolved
Copy link
Member

@TurboTurtle TurboTurtle left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@fmount fmount left a comment

Choose a reason for hiding this comment

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

lgtm, thanks @rebtoor

sos/report/plugins/openstack_nova.py Outdated Show resolved Hide resolved
sos/report/plugins/openstack_nova.py Outdated Show resolved Hide resolved
@TurboTurtle
Copy link
Member

@rebtoor this looks fine now, but it needs a rebase on current main due to a recent libvirt change. If you could do that and re-push this branch (you'll need to --force push it), then we can merge this.

@rebtoor
Copy link
Contributor Author

rebtoor commented Nov 22, 2023

@rebtoor this looks fine now, but it needs a rebase on current main due to a recent libvirt change. If you could do that and re-push this branch (you'll need to --force push it), then we can merge this.

Ack! I'll do it ASAP.

Thanks a lot!

EDPM (External DataPlane Management) will be the new way to deploy
compute nodes startin from RHOSP 18 which will replace TripleO/Director

- Added openstack_edpm plugin
- Added custom path for config and logs in
  frr/libvirt/logrotate/openstack_neutron/openstack_nova/ovn_host
  modules
- Tagged libvirt/openstack_neutron/openstack_nova/ovn_host modules
  as `openstack_edpm`

Signed-off-by: Roberto Alfieri <[email protected]>
@TurboTurtle
Copy link
Member

/packit rebuild-failed

@rebtoor
Copy link
Contributor Author

rebtoor commented Nov 27, 2023

@TurboTurtle is there something I can do to unlock packit builds?

@arif-ali
Copy link
Member

/packit rebuild-failed

Copy link

Account arif-ali has no write access nor is author of PR!

@rebtoor
Copy link
Contributor Author

rebtoor commented Nov 27, 2023

/packit rebuild-failed

Copy link

Congratulations! One of the builds has completed. 🍾

You can install the built RPMs by following these steps:

  • sudo yum install -y dnf-plugins-core on RHEL 8
  • sudo dnf install -y dnf-plugins-core on Fedora
  • dnf copr enable packit/sosreport-sos-3414
  • And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

@fmount
Copy link

fmount commented Nov 28, 2023

LGTM, thanks @rebtoor

@TurboTurtle TurboTurtle merged commit ffeb7d9 into sosreport:main Nov 28, 2023
33 checks passed
gibizer added a commit to gibizer/openstack-must-gather that referenced this pull request Dec 19, 2023
@fmount
Copy link

fmount commented Dec 21, 2023

@TurboTurtle is there an existing policy to get new tags/releases and builds? I'm wondering if we have a timeline to get this patch into a package (mostly commenting for CentOS).

@pmoravec
Copy link
Contributor

pmoravec commented Jan 3, 2024

@TurboTurtle is there an existing policy to get new tags/releases and builds? I'm wondering if we have a timeline to get this patch into a package (mostly commenting for CentOS).

A new sos upstream version (typically 4.Y) is released every 6 months, see https://github.com/sosreport/sos/releases .

Beyond that, tags (like 4.5.6) were created every 4 weeks to allow such frequent release policy from Red Hat. We / from Red Hat have paused this in past few months due to several independent reasons, but plan to start tagging upstream the same way soon.

@bogdando
Copy link
Contributor

JIRA OSPRH-5744

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.

6 participants