Update salt version to 2016.3.1

fwdriver, vncproxy: requirements workaround
graphite, manager: transform rabbitMQ user, and vhost state to the new form

salt/fwdriver/virtualenv.sls

 virtualenv_fwdriver:
 virtualenv_fwdriver:
   virtualenv.managed:
   virtualenv.managed:
     - name: /home/{{ pillar['fwdriver']['user'] }}/.virtualenvs/fw
     - name: /home/{{ pillar['fwdriver']['user'] }}/.virtualenvs/fw
-    - requirements: /home/{{ pillar['fwdriver']['user'] }}/fwdriver/requirements.txt
+    - requirements: /home/{{ pillar['fwdriver']['user'] }}/fwdriver/requirements/production.txt
     - user: {{ pillar['fwdriver']['user'] }}
     - user: {{ pillar['fwdriver']['user'] }}
     - no_chown: true
     - no_chown: true

salt/graphite/rabbitmq.sls

@@ -11,11 +11,14 @@ rabbitmq_user_monitor:
   rabbitmq_user.present:
   rabbitmq_user.present:
     - name: {{ pillar['graphite']['user'] }}
     - name: {{ pillar['graphite']['user'] }}
     - password: {{ pillar['graphite']['password'] }}
     - password: {{ pillar['graphite']['password'] }}
+    - require:
+      - rabbitmq_vhost: virtual_host_monitor
+    - perms:
+      - {{ pillar['graphite']['vhost']}}:
+        - .*
+        - .*
+        - .*
 
 
 virtual_host_monitor:
 virtual_host_monitor:
     rabbitmq_vhost.present:
     rabbitmq_vhost.present:
         - name: {{ pillar['graphite']['vhost']}}
         - name: {{ pillar['graphite']['vhost']}}
-        - user: {{ pillar['graphite']['user'] }}
-        - conf: .*
-        - write: .*
-        - read: .*

salt/manager/rabbitmq.sls

@@ -20,14 +20,16 @@ rabbitmq_user:
     - password: {{ pillar['amqp']['password'] }}
     - password: {{ pillar['amqp']['password'] }}
     - require:
     - require:
       - service: rabbitmq-server
       - service: rabbitmq-server
+      - rabbitmq_vhost: virtual_host
+    - perms:
+      - {{ pillar['amqp']['vhost']}}:
+        - .*
+        - .*
+        - .*
 
 
 virtual_host:
 virtual_host:
   rabbitmq_vhost.present:
   rabbitmq_vhost.present:
     - name: {{ pillar['amqp']['vhost']}}
     - name: {{ pillar['amqp']['vhost']}}
-    - user: {{ pillar['amqp']['user'] }}
-    - conf: .*
-    - write: .*
-    - read: .*
     - require:
     - require:
       - service: rabbitmq-server
       - service: rabbitmq-server
 
 

salt/manager/virtualenv.sls

@@ -18,7 +18,6 @@ virtualenv_manager:
     - name: /home/{{ pillar['user'] }}/.virtualenvs/circle
     - name: /home/{{ pillar['user'] }}/.virtualenvs/circle
     - requirements: /home/{{ pillar['user'] }}/circle/requirements/{{ pillar['deployment_type'] }}.txt
     - requirements: /home/{{ pillar['user'] }}/circle/requirements/{{ pillar['deployment_type'] }}.txt
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
-    - cwd: /home/{{ pillar['user'] }}/circle/
     - no_chown: true
     - no_chown: true
     - require:
     - require:
       - git: gitrepo
       - git: gitrepo

salt/vncproxy/virtualenv.sls

 virtualenv_vncproxy:
 virtualenv_vncproxy:
   virtualenv.managed:
   virtualenv.managed:
     - name: /home/{{ pillar['user'] }}/.virtualenvs/vncproxy
     - name: /home/{{ pillar['user'] }}/.virtualenvs/vncproxy
-    - requirements: /home/{{ pillar['user'] }}/vncproxy/requirements.txt
+    - requirements: /home/{{ pillar['user'] }}/vncproxy/requirements/production.txt
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
     - no_chown: true
     - no_chown: true