Jan Dittberner
6147a90066
This commit improves the salt setup of the Vagrant box: - Salt output is reduced to log level warning - Hosts entries are created for the internal IPs of all planned gva component VMs - .bashrc and a .bash_functions sourced from it are now managed for the vagrant user - the VM name has been changed to gva.local - recent salt versions do not depend on m2crypto anymore, therefore it is now installed before x509certificate functions are called - the rabbitmq_vhost for gva is now setup before any users are created because the previous implementation was broken with recent salt versions - the gnuviechadmin-locale-data-compile step has been simplified because Django 1.9's compilemessages takes care of recursive .mo file compilation - pillar data has been separated by role (especially queue permissions and credentials) - salt configuration is now unified with gvaldap
31 lines
1,020 B
Plaintext
31 lines
1,020 B
Plaintext
include:
|
|
- rabbitmq-server
|
|
|
|
gnuviechadmin-queue-vhost:
|
|
rabbitmq_vhost.present:
|
|
- name: {{ salt['pillar.get']('gnuviechadmin:queues:vhost') }}
|
|
|
|
{% for user in salt['pillar.get']('gnuviechadmin:queues:users') %}
|
|
gnuviechadmin-queue-user-{{ user }}:
|
|
rabbitmq_user.present:
|
|
- name: {{ user }}
|
|
- password: {{ salt['pillar.get']('gnuviechadmin:queues:users:%s:password' % user) }}
|
|
{% if salt['pillar.get']('gnuviechadmin:queues:users:%s:perms' % user) %}
|
|
- perms:
|
|
{% for vhost, perms in salt['pillar.get']('gnuviechadmin:queues:users:%s:perms' % user).iteritems() %}
|
|
- {{ vhost }}:
|
|
- {{ perms[0] }}
|
|
- {{ perms[1] }}
|
|
- {{ perms[2] }}
|
|
{% endfor %}
|
|
{% endif %}
|
|
{% if salt['pillar.get']('gnuviechadmin:queues:users:%s:tags' % user) %}
|
|
- tags:
|
|
{% for tag in salt['pillar.get']('gnuviechadmin:queues:users:%s:tags' % user) %}
|
|
- {{ tag }}
|
|
{% endfor %}
|
|
{% endif %}
|
|
- require:
|
|
- rabbitmq_vhost: {{ salt['pillar.get']('gnuviechadmin:queues:vhost') }}
|
|
{% endfor %}
|