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

Fix early avahi installation on controller #1447

Closed
wants to merge 1 commit into from

Conversation

mtravitzky
Copy link
Contributor

What does this PR change?

Previously, since the controller always runs on Leap, the custom repo was not added in the early stage of the controller's setup. Because of this, the installation of avahi-lang would always fail if avahi is enabled in main.tf. This usually wasn't noticed, because a later step will also attempt to install this package, which would then succeed. However, there might be a need for avahi being available during the early stages.

@mtravitzky mtravitzky requested review from nodeg and agraul December 13, 2023 13:47
@nodeg
Copy link
Member

nodeg commented Dec 13, 2023

For reference: This could be a possible duplicate of #1353

@Bischoff Bischoff self-requested a review December 13, 2023 13:52
Copy link
Contributor

@Bischoff Bischoff left a comment

Choose a reason for hiding this comment

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

lgtm, but see Oscar's comment

@@ -4,7 +4,7 @@ include:
{% if grains['use_avahi'] and grains.get('osmajorrelease', None) != None %}

# TODO: remove the following state when fix to bsc#1163683 is applied to all the SLES <= SLES15SP4
{% if grains['osfullname'] == 'SLES' and grains['osrelease'] != '15.5' %}
{% if (grains['osfullname'] == 'SLES' and grains['osrelease'] != '15.5') or (grains['osfullname'] == 'Leap') %}
Copy link
Member

Choose a reason for hiding this comment

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

What I read here https://bugzilla.suse.com/show_bug.cgi?id=1163683#c5
It doesn't match to what we compare in this statement 🤔

SP3, SP4 and SP5 already have avahi 0.8, which is not affected
But older SPs are still affected.

@juliogonzalez is this grains['osrelease'] != '15.5' correct?

Copy link
Member

@juliogonzalez juliogonzalez Dec 14, 2023

Choose a reason for hiding this comment

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

According to my comment, it seems it's not correct, and in fact it seems lines 25, 26, 27 and 28 could go away.

Please start podman containers and verify the avahi version there is 0.8 in Leap 15.3, 15.4 and 15.5 If so, I guess such lines can be removed.

@Bischoff you were the expert in avahi IIRC?

Copy link
Contributor

Choose a reason for hiding this comment

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

I contributed a bit to the avahi project yes, not sure that makes an expert out of me :trollface:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Anything new regarding this?

Copy link
Member

Choose a reason for hiding this comment

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

Anything new regarding this?

From my previous comment:

According to my comment, it seems it's not correct, and in fact it seems lines 25, 26, 27 and 28 could go away.
Please start podman containers and verify the avahi version there is 0.8 in Leap 15.3, 15.4 and 15.5 If so, I guess such lines can be removed.

Did you check the avahi version on such OS?

Copy link
Member

@nodeg nodeg Feb 7, 2024

Choose a reason for hiding this comment

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

I did a quick check via zypper info avahi with distrobox and got:
15.3: avahi 0.7
15.4: avahi 0.8
15.5 avahi 0.8

Copy link
Member

Choose a reason for hiding this comment

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

ACK, then it seems Leap >= 15.4 and SLE15 >= SP4 do not need the extra avahi, so you can cleanup the sls file to remove:

    {% elif grains['osrelease'] == '15.4' %}
    - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.8/15.4/
    {% elif grains['osrelease'] == '15.5' and grains['osfullname'] == 'Leap' %}
    - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.8/15.5/

And if everything is working fine after the PR is merged, 15.4 and 15.5 could have avahi building disabled should be removed at systemsmanagement:/sumaform:/tools at OBS, to save OBS resources.

Copy link
Member

Choose a reason for hiding this comment

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

I wonder why my comment said SP3 does not have it but now Leap 15.3 has it... maybe someone bumped the version in SLE15SP3 after the EoL of Leap 15.3

Copy link
Member

Choose a reason for hiding this comment

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

No, I checked and it seems my comment was wrong. SLE15SP3 has 0.7

Previously, since the controller always runs on Leap, the custom repo
was not added in the early stage of the controller's setup. Because
of this, the installation of avahi-lang would always fail if avahi
is enabled in main.tf. This usually wasn't noticed, because a later
step will also attempt to install this package, which would then
succeed. However, there might be a need for avahi being available
during the early stages.
@mtravitzky mtravitzky force-pushed the controller-fix-avahi-install branch from 886ddfe to 6c48606 Compare January 10, 2024 12:43
@mtravitzky
Copy link
Contributor Author

It is possible that this issue might have already been fixed by 3abec07 . It does not occur during deployment using the current code.

@nodeg
Copy link
Member

nodeg commented Feb 13, 2024

Since we use openSUSE Leap 15.5 as default on the controller, and you verified that the issue is not present anymore, FMPOV this PR can get closed.

@jordimassaguerpla
Copy link
Contributor

Since we use openSUSE Leap 15.5 as default on the controller, and you verified that the issue is not present anymore, FMPOV this PR can get closed.

Agree on closing. Thanks anyway for the work 👍

@mtravitzky mtravitzky closed this Feb 13, 2024
@nodeg nodeg deleted the controller-fix-avahi-install branch August 28, 2024 13:37
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.

8 participants