fix(config): create vhost before users

Author: noelmcloughlin

rabbitmq/config/clean.sls

@@ -2,13 +2,13 @@
 # vim: ft=sls
 
 include:
-  - .users.clean
-  - .vhosts.clean
-  - .exchanges.clean
+  - .parameters.clean
+  - .policies.clean
   - .bindings.clean
+  - .exchanges.clean
   - .queues.clean
-  - .policies.clean
-  - .plugins.clean
-  - .parameters.clean
+  - .vhosts.clean
   - .clusters.clean
+  - .users.clean
+  - .plugins.clean
   - .files.clean

rabbitmq/config/init.sls

@@ -3,8 +3,8 @@
 
 include:
   - .files
-  - .users
   - .vhosts
+  - .users
   - .queues
   - .policies
   - .plugins

rabbitmq/config/users/install.sls

@@ -19,17 +19,17 @@ rabbitmq-config-users-added-{{ name }}-{{ user }}:
   cmd.run:
     - names:
       - {{ cmd }} --node {{ name }} add_user {{ user }} {{ u.password }} ||true
-          {%- if 'force' in u and u.force %}
+                {%- if 'force' in u and u.force %}
       - {{ cmd }} --node {{ name }} change_password {{ user }} {{ u.password }}
-          {%- endif %}
-          {%- if 'tags' in u and u.tags %}
+                {%- endif %}
+                {%- if 'tags' in u and u.tags %}
       - {{ cmd }} --node {{ name }} set_user_tags {{ user }} {{ u.tags|join(' ') }}   # noqa 204
-          {%- endif %}
-          {%- if 'perms' in u and u.perms %}
-              {%- for vhost, perms in u.perms.items() %}
+                {%- endif %}
+                {%- if 'perms' in u and u.perms %}
+                    {%- for vhost, perms in u.perms.items() %}
       - {{ cmd }} --node {{ name }} set_permissions -p {{ vhost }} {{ user }} {{ perms|map("json")|join(" ") }}  # noqa 204
-              {%- endfor %}
-          {%- endif %}
+                    {%- endfor %}
+                {%- endif %}
     - onlyif: test -x {{ cmd }}
     - runas: rabbitmq
     - require: