Skip to content

Conversation

@bshephar
Copy link
Contributor

No description provided.

This change writes systemd files to etc instead of /usr/share
along with adding support for Python libraries baked into the bootc image.

Signed-off-by: Brendan Shephard <[email protected]>
This change moves the script we're using for the
logs cronjob into the /var/lib/openstack/cron directory. This facilitates
the bootc immutable filesystem where we can't write to /usr, while also
consolidating scripts relevant to our deployment in a common place.

Signed-off-by: Brendan Shephard <[email protected]>
Signed-off-by: Brendan Shephard <[email protected]>
This change skips any calls to dnf on bootc nodes since they are expected to fail.

Signed-off-by: Brendan Shephard <[email protected]>
@openshift-ci openshift-ci bot requested review from abays and jamepark4 January 21, 2025 12:52
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bshephar

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

Copy link
Contributor

@slagle slagle left a comment

Choose a reason for hiding this comment

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

  1. The edpm_kernel tasks from playbooks/bootstrap.yml need to be skipped as they are in the other PR.
  2. edpm_tuned needs to skip the package installs
  3. /etc/localtime is missing in the bootc image. we could have edpm_timezone create it.

- 'edpm-container-shutdown'
- 'edpm-start-podman-container'
- name: "Create /usr/lib/systemd/system/edpm-container-shutdown.service"
when: not edpm_use_bootc
Copy link
Contributor

Choose a reason for hiding this comment

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

we'll need to do this even for bootc, unless we want to add it to the image build instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, if we want to write them to /var/local then we can drop this.

Looks like I didn't update that commit with the new variable name anyway

delay: "{{ edpm_libvirt_download_delay }}"
notify:
- Restart libvirt
when: not ansible_local.bootc
Copy link
Contributor

Choose a reason for hiding this comment

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

We need to install all these packages in the image don't we?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I had a few package related changes in my Containerfile:
https://github.com/openstack-k8s-operators/edpm-image-builder/pull/39/files#diff-20143ae4d38840b7744728ec7c6720a7891a112cabf4fe01bf9d109deff67788R22-R23

Among others, like python-pyroute2 was also required for os-net-config for example.

@slagle slagle mentioned this pull request Jan 21, 2025
@slagle
Copy link
Contributor

slagle commented Jan 21, 2025

I've addressed all my comments in a new PR: #858

I've included your commits from this PR there as well. We can collaborate on either PR, doesn't matter to me, but I didn't want to push all my commits to your private branch without checking with you first.

There are also some fixes to edpm-image-builder I used:
openstack-k8s-operators/edpm-image-builder#47
openstack-k8s-operators/edpm-image-builder#48
openstack-k8s-operators/edpm-image-builder#49

With all of that together, I got a successful deployment.

@bshephar bshephar closed this Jan 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants