Skip to content

Commit 6be2b5a

Browse files
committed
fix(package/repo/install): add amazonlinux check
1 parent d945e4c commit 6be2b5a

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

rabbitmq/package/repo/install.sls

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,17 @@ rabbitmq-package-repo-rabbitmq:
4545
- pkg: rabbitmq-package-install-pkg-installed
4646
4747
{% elif grains['os_family'] == 'RedHat' %}
48+
{%- if grains['os'] == 'Amazon' %}
49+
{%- set releasever = salt['cmd.run']("rpm -E '%{rhel}'") %}
50+
{%- else %}
51+
{%- set releasever = grains['osmajorrelease'] %}
52+
{%- endif %}
4853
4954
rabbitmq-package-repo-erlang:
5055
pkgrepo.managed:
5156
- name: rabbitmq_rabbitmq-server
5257
# using cloudsmith.io for rabbitmq-erlang (recommended)
53-
- baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el/{{ grains.osmajorrelease }}/$basearch
58+
- baseurl: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el/{{ releasever }}/$basearch
5459
- gpgkey: https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key
5560
- repo_gpgcheck: 1
5661
- enabled: 1
@@ -68,7 +73,7 @@ rabbitmq-package-repo-rabbitmq:
6873
pkgrepo.managed:
6974
- name: rabbitmq-rabbitmq
7075
# using packagecloud for rabbitmq-server (recommended)
71-
- baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el/{{ grains.osmajorrelease }}/$basearch
76+
- baseurl: https://packagecloud.io/rabbitmq/rabbitmq-server/el/{{ releasever }}/$basearch
7277
- gpgkey: https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey
7378
- enabled: 1
7479
- gpgcheck: 0

0 commit comments

Comments
 (0)