Skip to content

Commit c7f65dd

Browse files
committed
fix: recursive requisite rabbitmqadmin with latest salt builds
1 parent 84380ad commit c7f65dd

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

rabbitmq/config/plugins/install.sls

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,15 @@ rabbitmq-config-plugins-enabled-{{ name }}-{{ plugin }}:
2626
2727
rabbitmq-config-plugins-{{ name }}-rabbitmqadmin-install:
2828
cmd.run:
29-
- name : curl -k -L http://127.0.0.1:15672/cli/rabbitmqadmin -o /usr/local/sbin/rabbitmqadmin
30-
- unless: test -x /usr/local/sbin/rabbitmqadmin
29+
{%- set rabbitmqadmin = "/usr/local/sbin/rabbitmqadmin" %}
30+
- name: >
31+
curl -k -L http://127.0.0.1:15672/cli/rabbitmqadmin -o {{ rabbitmqadmin }}
32+
&& chown root:{{ rabbitmq.rootgroup }} {{ rabbitmqadmin }}
33+
&& chmod 755 {{ rabbitmqadmin }}
34+
- unless: test -x {{ rabbitmqadmin }}
3135
- onlyif: /usr/sbin/rabbitmq-plugins --node {{ name }} is_enabled rabbitmq_management
3236
- require:
3337
- sls: {{ sls_service_running }}
34-
file.managed:
35-
- name: /usr/local/sbin/rabbitmqadmin
36-
- user: root
37-
- force: false
38-
- replace: false
39-
- group: {{ rabbitmq.rootgroup }}
40-
- mode: 755
41-
- require:
42-
- cmd : rabbitmq-config-plugins-{{ name }}-rabbitmqadmin-install
4338
4439
{%- endif %}
4540
{%- endfor %}

0 commit comments

Comments
 (0)