Setup redis and rabbitmq, fix gvaldap and gvaweb

This commit takes care of making rabbitmq and redis work on a messaging
server. The configuration of gvaldap and gvaweb has been adapted to make
both applications work with actual running rabbitmq and redis.

pillar/gnuviechadmin/init.sls

@@ -9,7 +9,6 @@ gnuviechadmin:
   adminemail: admin@gnuviech-server.de
   sitename: Gnuviech Customer Self Service
   domainname: localhost
-  devinstance: True
   minosuid: 10000
   minosgid: 10000
   osuserprefix: usr

pillar/top.sls

@@ -1,5 +1,8 @@
 base:
-{%- for role in ('database', 'redis', 'queues', 'gva', 'gvaldap', 'gvafile', 'gvamysql', 'gvapgsql', 'gvaweb') %}
+  'roles:redis-server':
+    - match: grain
+    - gnuviechadmin.redis
+{%- for role in ('database', 'queues', 'gva', 'gvaldap', 'gvafile', 'gvamysql', 'gvapgsql', 'gvaweb') %}
   'roles:gnuviechadmin.{{ role }}':
     - match: grain
     - gnuviechadmin.{{ role }}

states/gnuviechadmin/gvaapp_macros.sls

@@ -168,7 +168,7 @@ update-{{ gvaappname }}-pip:
 {% set update_git = salt['grains.get']('gnuviechadmin:update_git', True) %}
 
 {% set servicename = "{}-celery-worker".format(gvaappname) %}
-{% set amqp_user = salt['pillar.get']('gnuviechadmin:{}:amqpuser'.format(gvaappname)) -%}
+{% set amqp_user = salt['pillar.get']('gnuviechadmin:{}:amqp_user'.format(gvaappname)) -%}
 {{ gvaapp_base(gvaappname, servicename ) }}
 /etc/default/{{ gvaappname }}:
   file.managed:
@@ -180,7 +180,7 @@ update-{{ gvaappname }}-pip:
     - context:
         virtualenv: {{ venv }}
         checkout: {{ checkout }}
-        broker_url: amqp://{{ amqp_user }}:{{ salt['pillar.get']('gnuviechadmin-queues:users:{}:password'.format(amqp_user)) }}@mq/{{ salt['pillar.get']('gnuviechadmin-queues:vhost') }}
+        broker_url: amqp://{{ amqp_user }}:{{ salt['pillar.get']('gnuviechadmin:queues:users:{}:password'.format(amqp_user)) }}@{{ salt['pillar.get']('gnuviechadmin:amqp_host', 'mq') }}/{{ salt['pillar.get']('gnuviechadmin:queues:vhost') }}
         result_url: redis://:{{ salt['pillar.get']('gnuviechadmin:redis_password') }}@{{ salt['pillar.get']('gnuviechadmin:redis_host') }}/0
     - watch_in:
       - service: {{ servicename }}

states/gnuviechadmin/queues.sls

@@ -16,7 +16,7 @@ gnuviechadmin-queue-user-{{ 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() %}
+{% for vhost, perms in salt['pillar.get']('gnuviechadmin:queues:users:%s:perms' % user).items() %}
       - {{ vhost }}:
         - {{ perms[0] }}
         - {{ perms[1] }}