Skip to content

Commit

Permalink
Merge pull request #70 from Fdall/bug_23816/ansible_collection_should…
Browse files Browse the repository at this point in the history
…_not_try_to_check_for_os_version_before_installing_the_repositories_and_packages

Fixes #23816: Ansible collection should not try to check for OS version before installing the repositories and packages
  • Loading branch information
Fdall committed Nov 30, 2023
2 parents 9b52a77 + 351cf83 commit 15223c5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -373,8 +373,8 @@ blue tests/unit/plugins/modules/test_node_settings_parameter_overloard.py

To push the collection, you must have a [GitHub](https://github.com/) account.

* Log in to Galaxy with the account that will perform the buid and publication.
* Generate Galaxy API key, more informations [here](https://docs.ansible.com/ansible/latest/cli/ansible-galaxy.html#synopsis).
* Log in to Galaxy with the account that will perform the build and publication.
* Generate Galaxy API key, more information [here](https://docs.ansible.com/ansible/latest/cli/ansible-galaxy.html#synopsis).
* Modify the content of the `galaxy.yml` file before publishing.
* Build the collection locally with `ansible-galaxy collection build`.
* Then *publish* the collection with the following command `ansible-galaxy collection publish ./rudder-ansible-1.0.0.tar.gz --api-key you_galaxy_api_key`
4 changes: 2 additions & 2 deletions roles/rudder_repository/tasks/main.yml
Expand Up @@ -5,8 +5,8 @@
when: ansible_os_family == "Suse"

- include_tasks: debian.yml
when: (ansible_distribution == "Debian" and ansible_distribution_version is version("11", "<=")) or
(ansible_distribution == "Ubuntu" and ansible_distribution_version is version("22.04", "<="))
when: (ansible_distribution == "Debian") or
(ansible_distribution == "Ubuntu")

- include_tasks: redhat.yml
when: (ansible_distribution == "CentOS" and ansible_distribution != "Fedora") or
Expand Down
4 changes: 2 additions & 2 deletions roles/rudder_server/tasks/main.yml
Expand Up @@ -8,8 +8,8 @@
when: ansible_os_family == "Suse"

- include_tasks: debian.yml
when: (ansible_distribution == "Debian" and ansible_distribution_version is version("11", "<=")) or
(ansible_distribution == "Ubuntu" and ansible_distribution_version is version("22.04", "<="))
when: (ansible_distribution == "Debian") or
(ansible_distribution == "Ubuntu")

- include_tasks: redhat.yml
when: (ansible_distribution == "CentOS" and ansible_distribution != "Fedora") or
Expand Down

0 comments on commit 15223c5

Please sign in to comment.