manager fix

requirements.txt

@@ -4,3 +4,5 @@ netifaces
 halo
 virtualenvwrapper
 stevedore
+setuptools<58
+pip<21

salt/manager/rabbitmq.sls

@@ -14,21 +14,32 @@ rabbitmq-server:
       - file: rabbitmq-server
       {% endif %}
 
-virtual_host:
+virtual_host_amqp:
   rabbitmq_vhost.present:
     - name: {{ pillar['amqp']['vhost']}}
     - require:
       - service: rabbitmq-server
 
-rabbitmq_user:
+rabbitmq_user_amqp:
   rabbitmq_user.present:
     - name: {{ pillar['amqp']['user'] }}
     - password: {{ pillar['amqp']['password'] }}
     - perms: [{ {{ pillar['amqp']['vhost']}}: [.*, .*, .*]}]
-#      - '{{ pillar['amqp']['vhost']}}':
-#        - conf: ".*"
-#        - write: " .*"
-#        - read: ".*"
     - require:
       - service: rabbitmq-server
 
+virtual_host_graphite:
+  rabbitmq_vhost.present:
+    - name: {{ pillar['graphite']['vhost']}}
+    - require:
+      - service: rabbitmq-server
+
+rabbitmq_user_graphite:
+  rabbitmq_user.present:
+    - name: {{ pillar['graphite']['user'] }}
+    - password: {{ pillar['graphite']['password'] }}
+    - perms: [{ {{ pillar['graphite']['vhost']}}: [.*, .*, .*]}]
+    - require:
+      - service: rabbitmq-server
+
+

salt/manager/virtualenv.sls

@@ -23,14 +23,27 @@ virtualenv_manager:
     - no_chown: true
     - require:
       - git: gitrepo
+      - virtualenv: virtualenv_install_first
       {% if grains['os_family'] == 'RedHat' %}
       - environ: m2crypto_swig_env
       {% endif %}
 
+virtualenv_install_first:
+  virtualenv.managed:
+    - python: /usr/bin/python3
+    - name: /home/{{ pillar['user'] }}/.virtualenvs/circle
+    - requirements: /home/{{ pillar['user'] }}/circle/requirements/install_first.txt
+    - user: {{ pillar['user'] }}
+    - cwd: /home/{{ pillar['user'] }}/circle/
+    - no_chown: true
+
+
 /home/{{ pillar['user'] }}/.virtualenvs/circle/lib/python3.6/site-packages/simplesshkey/models.py:
   file.patch:
     - source: file:///home/{{ pillar['user'] }}/circle/requirements/simplesshkey.patch
     - strip: 5
+    - require:
+      - virtualenv: virtualenv_manager
 
 salt://manager/files/syncdb.sh:
   cmd.script: