Adjust wildcard definition

There was no reason to adjust rabbitmq_package_version previously, as
replaced by the wildcard part is never changed, so patching that doesn't
have any practical sense. We also return `-1` to erlang spec, so that
wildcard would match only the part we expect to change.

This partially reverts I99683a031f935b579d38ae457c484c9a150344c6

Change-Id: Ie2e783d065f32b906ee1554abaf5dc3b24236ca8
This commit is contained in:
Dmitriy Rabotyagov 2023-07-06 11:21:09 +02:00 committed by Dmitriy Rabotyagov
parent 953ceccb0b
commit 2fc53a3a03
2 changed files with 4 additions and 4 deletions

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
_rabbitmq_install_method: external_repo _rabbitmq_install_method: external_repo
_rabbitmq_package_version: "3.11.17*" _rabbitmq_package_version: "3.11.17-1"
_rabbitmq_gpg_keys: _rabbitmq_gpg_keys:
- file: gpg/C072C960 - file: gpg/C072C960
@ -35,7 +35,7 @@ _rabbitmq_erlang_repo:
state: "present" state: "present"
filename: els_erlang filename: els_erlang
_rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:25.3.2*', '1:22.*') }}" _rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:25.3.2.*-1', '1:22.*') }}"
rabbitmq_dependencies: rabbitmq_dependencies:
- erlang-base - erlang-base

View File

@ -14,12 +14,12 @@
# limitations under the License. # limitations under the License.
_rabbitmq_install_method: external_repo _rabbitmq_install_method: external_repo
_rabbitmq_package_version: "3.11.17*" _rabbitmq_package_version: "3.11.17-1"
# NOTE(nhanlon) 2023-05-30: although the package repository is marked # NOTE(nhanlon) 2023-05-30: although the package repository is marked
# el9, the packages themselves still have an el8 dist tag for rabbitmq # el9, the packages themselves still have an el8 dist tag for rabbitmq
_rabbitmq_package_dist_tag: "el8" _rabbitmq_package_dist_tag: "el8"
_erlang_package_version: "25.3.2*" _erlang_package_version: "25.3.2.*-1"
_erlang_package_dist_tag: "el{{ ansible_facts['distribution_major_version'] }}" _erlang_package_dist_tag: "el{{ ansible_facts['distribution_major_version'] }}"
# NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/ # NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/