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

Separate installation of repos #1272

Merged
merged 19 commits into from
Jun 6, 2024
Merged

Conversation

pyrodie18
Copy link
Collaborator

SUMMARY

This PR will remove the repo installation tasks from the individual roles and consolidate them into a single role that each of the roles references as requested in #1242.

Also adds the downloading of the GPG key for RHEL based operating systems as was started in #1239 (credit to @jonathananspw)

All adds support for yum authentication on RHEL based operating systems as was started in #1185 (credit to @USer78012)

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

All roles

@pyrodie18 pyrodie18 requested a review from BGmot June 5, 2024 00:41
docs/ZABBIX_MANAGE_REPO_ROLE.md Outdated Show resolved Hide resolved
molecule/zabbix_manage_repo/molecule.yml Outdated Show resolved Hide resolved
roles/zabbix_agent/vars/Debian.yml Show resolved Hide resolved
roles/zabbix_manage_repo/requirements.yml Outdated Show resolved Hide resolved
@@ -44,6 +44,3 @@ zabbix_valid_web_versions:
- 6.4
- 6.2
Copy link
Collaborator

Choose a reason for hiding this comment

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

Remove 6.2? add 7.0?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Didn't add 7.0 yet (doing things one at a time). But removing 6.2

Copy link
Collaborator

Choose a reason for hiding this comment

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

I am still seeing 6.2 ? or ...?

@eb4x
Copy link
Collaborator

eb4x commented Jun 5, 2024

Would you mind changing the role name to just zabbix_repo so it matches what the prefixes are (or will be) in defaults/main.yml?

It just keeps things (mostly) consistent between all role names and their defaults.

@pyrodie18
Copy link
Collaborator Author

Would you mind changing the role name to just zabbix_repo so it matches what the prefixes are (or will be) in defaults/main.yml?

It just keeps things (mostly) consistent between all role names and their defaults.

To easy

- name: "Configure SELinux when enabled"
ansible.builtin.include_tasks: selinux.yml
when:
- zabbix_server_selinux | default (false) | bool
Copy link
Collaborator

Choose a reason for hiding this comment

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

You sure we don't want to reuse the previous when: ansible_facts.selinux.status | default('disabled') == 'enabled' here? i.e. anything that reports selinux_enabled we apply on. (Suse also comes with selinux, #1194 and I think he would have an easier job (smaller PR) adding support after this merges.)

Copy link
Collaborator

Choose a reason for hiding this comment

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

Hmm, actually I think even better would be to put this when condition into defaults, so users can explicitly override us. Shame I didn't think about that in the selinux refactor.

--- # defaults/main.yml
zabbix_server_selinux: "{{ ansible_facts.selinux.status | default('disabled') == 'enabled' }}"

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Don't remember where we had that but now that you say it ya I remember seeing that. Ya I think I like that better.

@pyrodie18
Copy link
Collaborator Author

@BGmot I think this one is ready to go if you want to take a peak

Copy link
Collaborator

@BGmot BGmot left a comment

Choose a reason for hiding this comment

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

Confused... still seeing 6.2 in some places. Have you removed them?

@@ -20,6 +20,3 @@ zabbix_valid_javagateway_versions:
- 6.4
- 6.2
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove 6.2

@@ -27,9 +27,6 @@ zabbix_valid_server_versions:
- 6.2
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please remove 6.2

@@ -44,6 +44,3 @@ zabbix_valid_web_versions:
- 6.4
- 6.2
Copy link
Collaborator

Choose a reason for hiding this comment

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

I am still seeing 6.2 ? or ...?

@pyrodie18
Copy link
Collaborator Author

Ya I removed 6.2 in a different PR..... #1274 I think is ready so if you want to approve that one too it should automagically take care of this one.

Copy link
Collaborator

@BGmot BGmot left a comment

Choose a reason for hiding this comment

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

Great job! Thanks!

@pyrodie18 pyrodie18 merged commit 7bc2a10 into ansible-collections:main Jun 6, 2024
281 of 288 checks passed
@pyrodie18 pyrodie18 deleted the 1262 branch June 6, 2024 16:57
pyrodie18 added a commit to pyrodie18/community.zabbix that referenced this pull request Jun 6, 2024
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.

3 participants