Merge "Move version pinnings from distro vars to defaults"

This commit is contained in:
Zuul 2024-11-25 18:57:07 +00:00 committed by Gerrit Code Review
commit 82069b5d23
3 changed files with 5 additions and 8 deletions

View File

@ -20,6 +20,10 @@ cache_timeout: 600
# Options are 'present' and 'latest' # Options are 'present' and 'latest'
rabbitmq_package_state: "latest" rabbitmq_package_state: "latest"
# Defined versions of RabbitMQ and Erlang
rabbitmq_package_version: "4.0.3-1"
rabbitmq_erlang_package_version: "26.2.*-1"
# Inventory group containing the hosts for the cluster # Inventory group containing the hosts for the cluster
rabbitmq_host_group: "rabbitmq_all" rabbitmq_host_group: "rabbitmq_all"
@ -51,7 +55,6 @@ rabbitmq_upgrade: false
rabbitmq_ignore_version_state: false rabbitmq_ignore_version_state: false
rabbitmq_package_url: "" rabbitmq_package_url: ""
rabbitmq_package_version: "{{ _rabbitmq_package_version }}"
rabbitmq_package_sha256: "" rabbitmq_package_sha256: ""
rabbitmq_package_path: "" rabbitmq_package_path: ""
@ -86,9 +89,6 @@ rabbitmq_erlang_repo_url: "{{ _rabbitmq_erlang_repo_url | default(null) }}"
# Set the repo information for the Erlang repository # Set the repo information for the Erlang repository
rabbitmq_erlang_repo: "{{ _rabbitmq_erlang_repo | default({}) }}" rabbitmq_erlang_repo: "{{ _rabbitmq_erlang_repo | default({}) }}"
# Set the elang version used on the deployment
rabbitmq_erlang_package_version: "{{ _rabbitmq_erlang_package_version }}"
# Choose file, distro, external_repo for rabbitmq_install_method. # Choose file, distro, external_repo for rabbitmq_install_method.
rabbitmq_install_method: "{{ _rabbitmq_install_method }}" rabbitmq_install_method: "{{ _rabbitmq_install_method }}"
rabbitmq_erlang_install_method: "{{ _rabbitmq_erlang_install_method | default(rabbitmq_install_method) }}" rabbitmq_erlang_install_method: "{{ _rabbitmq_erlang_install_method | default(rabbitmq_install_method) }}"

View File

@ -14,8 +14,6 @@
# limitations under the License. # limitations under the License.
_rabbitmq_install_method: external_repo _rabbitmq_install_method: external_repo
_rabbitmq_package_version: "4.0.3-1"
_rabbitmq_erlang_package_version: "26.2.*-1"
_rabbitmq_repo_url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/{{ ansible_facts['distribution'] | lower }}" _rabbitmq_repo_url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/{{ ansible_facts['distribution'] | lower }}"
_rabbitmq_repo: _rabbitmq_repo:

View File

@ -14,12 +14,11 @@
# limitations under the License. # limitations under the License.
_rabbitmq_install_method: external_repo _rabbitmq_install_method: external_repo
_rabbitmq_package_version: "4.0.3-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"
_rabbitmq_erlang_package_version: "26.2.*-1"
_rabbitmq_erlang_package_dist_tag: "el{{ ansible_facts['distribution_major_version'] }}" _rabbitmq_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/