Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
rabbitmq-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
rabbitmq-formula
Commits
41085231
Commit
41085231
authored
4 years ago
by
noelmcloughlin
Browse files
Options
Downloads
Patches
Plain Diff
fix(user): ensure user.present fully works
parent
866a6c13
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
pillar.example
+14
-18
14 additions, 18 deletions
pillar.example
rabbitmq/config/user/install.sls
+3
-1
3 additions, 1 deletion
rabbitmq/config/user/install.sls
rabbitmq/parameters/defaults.yaml
+1
-0
1 addition, 0 deletions
rabbitmq/parameters/defaults.yaml
with
18 additions
and
19 deletions
pillar.example
+
14
−
18
View file @
41085231
...
...
@@ -4,8 +4,8 @@
rabbitmq
:
cluster
:
rabbit@locahost
:
user
:
rabbit
# 'user: rabbit' is confusing;
its actually
'node: rabbit'
but ...
host
:
rabbitmq
# short hostname of node to join to, not fqdn
user
:
rabbit
# 'user: rabbit' is confusing; 'node: rabbit'
would be better
host
:
hostname
# short hostname of node to join to, not fqdn
ram_node
:
None
runas
:
rabbitmq
erlang_cookie
:
...
...
@@ -30,26 +30,26 @@ rabbitmq:
base
:
/var/lib/rabbitmq
vhost
:
-
airflow
-
test_vhost
binding
:
my-new-binding
:
-
destination_type
:
queue
-
destination
:
my-new-queue
-
routing_key
:
a_routing_key_string
-
user
:
airflow
-
user
:
saltstack
-
passwd
:
'
password'
-
vhost
:
airflow
-
vhost
:
test_vhost
-
arguments
:
-
'
x-message-ttl'
:
8640000
queue
:
my-new-queue
:
-
user
:
airflow
-
user
:
saltstack
-
passwd
:
'
password'
-
durable
:
true
-
auto_delete
:
false
-
vhost
:
airflow
-
vhost
:
test_vhost
-
arguments
:
-
'
x-message-ttl'
:
8640000
-
'
x-expires'
:
8640000
...
...
@@ -57,13 +57,13 @@ rabbitmq:
exchange
:
my-new-exchange
:
-
user
:
airflow
-
user
:
saltstack
-
passwd
:
'
password'
-
type
:
fanout
-
durable
:
true
-
internal
:
false
-
auto_delete
:
false
-
vhost
:
airflow
-
vhost
:
test_vhost
-
arguments
:
-
'
alternate-**exchange'
:
'
amq.fanout'
-
'
test-header'
:
'
testing'
...
...
@@ -82,7 +82,7 @@ rabbitmq:
upstream
:
upstream_1
:
-
uri
:
amqp://
airflow
:password@localhost
-
uri
:
amqp://
saltstack
:password@localhost
-
trust_user_id
:
true
-
ack_mode
:
on-confirm
-
max_hops
:
1
...
...
@@ -108,17 +108,13 @@ rabbitmq:
-
'
.*'
-
'
.*'
-
runas
:
root
airflow
:
-
password
:
airflow
-
force
:
tru
e
saltstack
:
-
password
:
password
-
force
:
fals
e
-
tags
:
-
administrator
-
perms
:
-
airflow
:
-
'
.*'
-
'
.*'
-
'
.*'
-
'
/'
:
-
test_vhost
:
-
'
.*'
-
'
.*'
-
'
.*'
...
...
This diff is collapsed.
Click to expand it.
rabbitmq/config/user/install.sls
+
3
−
1
View file @
41085231
...
...
@@ -15,7 +15,9 @@ include:
rabbitmq-config-user-present-{{ name }}:
rabbitmq_user.present:
- name: {{ name }}
- {{ user|yaml }}
{%- for item in user %}
- {{ item|json }}
{%- endfor %}
- require:
- sls: {{ sls_service_running }}
- sls: {{ sls_config_vhost }}
...
...
This diff is collapsed.
Click to expand it.
rabbitmq/parameters/defaults.yaml
+
1
−
0
View file @
41085231
...
...
@@ -15,6 +15,7 @@ values:
cleanlist
:
-
/usr/local/bin/rabbitmq-env
-
/usr/local/bin/rabbitmq-plugins
-
/var/run/rabbitmq
env
:
name
:
/etc/rabbitmq/rabbitmq-env.conf
locale_all
:
null
...
...
This diff is collapsed.
Click to expand it.
Dennis Ahrens
@ahrensde
mentioned in commit
697dd87d
·
4 years ago
mentioned in commit
697dd87d
mentioned in commit 697dd87da0e7b8073a441074301342646e21a55f
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment