Skip to content
Snippets Groups Projects
Commit d5e74100 authored by noelmcloughlin's avatar noelmcloughlin
Browse files

fix(config): remove requisite (in case of failure); add user/group

parent 5bac4bb0
Branches
Tags
No related merge requests found
......@@ -11,15 +11,15 @@ include:
- {{ sls_config_user }}
{%- for name, cluster in salt["pillar.get"]("rabbitmq:cluster", {}).items() %}
{%- if 'erlang_cookie' in cluster and cluster.erlang_cookie is mapping %}
{%- if cluster.host and 'erlang_cookie' in cluster and cluster.erlang_cookie is mapping %}
rabbitmq-config-cluster-join-{{ name }}:
rabbitmq-config-cluster-{{ name }}-join-{{ cluster.host }}:
file.managed:
- name: {{ cluster.erlang_cookie.name }}
- contents: {{ cluster.erlang_cookie.value }}
- mode: 400
- user: {{ cluster.user }}
- group: root
- user: {{ rabbitmq.config.user }}
- group: {{ rabbitmq.config.user }}
- makedirs: True
- watch_in:
- service: rabbitmq-service-running-service-running
......@@ -32,7 +32,7 @@ rabbitmq-config-cluster-join-{{ name }}:
- ram_node: {{ cluster.ram_node }}
- runas: {{ cluster.runas }}
- require:
- file: rabbitmq-config-cluster-join-{{ name }}
- file: rabbitmq-config-cluster-{{ name }}-join-{{ cluster.host }}
- sls: {{ sls_config_user }}
- service: rabbitmq-service-running-service-running
......
......@@ -14,6 +14,6 @@ rabbitmq-config-vhost-present-{{ name }}:
rabbitmq_vhost.present:
- name: {{ name }}
- require:
- service: {{ rabbitmq.service.name }}
- service: rabbitmq-service-running-service-running
{% endfor %}
......@@ -23,6 +23,8 @@ values:
RABBITMQ_BASE: /var/lib/rabbitmq
config:
name: /etc/rabbitmq/rabbitmq.conf
user: rabbitmq
group: rabbitmq
# see rabbitmq.conf.example from rabbitmq-server github docs
context: {}
service:
......
......@@ -12,5 +12,4 @@ rabbitmq-service-clean-service-dead:
service.dead:
- name: {{ rabbitmq.service.name }}
- enable: False
- require_in:
- sls: {{ sls_package_clean }}
- sig: 'rabbit boot'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment