manager

salt/manager/configuration.sls

@@ -8,7 +8,7 @@ manager_postactivate:
 
 
 portal.conf:
 portal.conf:
   file.managed:
   file.managed:
-    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
     - name: /etc/systemd/system/portal.service
     - name: /etc/systemd/system/portal.service
     {% else %}
     {% else %}
     - name: /etc/init/portal.conf
     - name: /etc/init/portal.conf
@@ -16,7 +16,7 @@ portal.conf:
     - user: root
     - user: root
     - group: root
     - group: root
     - template: jinja
     - template: jinja
-    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+    {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
 
 
     {% if pillar['deployment_type'] == 'production' %}
     {% if pillar['deployment_type'] == 'production' %}
     - source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal-uwsgi.service
     - source: file:///home/{{ pillar['user'] }}/circle/miscellaneous/portal-uwsgi.service
@@ -34,7 +34,7 @@ portal.conf:
 
 
     {% endif %}
     {% endif %}
 
 
-{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+{% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
 /etc/systemd/system/manager.service:
 /etc/systemd/system/manager.service:
   file.managed:
   file.managed:
     - user: root
     - user: root

salt/manager/init.sls

@@ -61,7 +61,7 @@ manager:
     - enable: True
     - enable: True
     - watch:
     - watch:
       - file: manager_postactivate
       - file: manager_postactivate
-      {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' %}
+      {% if grains['os_family'] == 'RedHat' or grains['os'] == 'Debian' or grains['osfinger'] == 'Ubuntu-16.04' %}
       - file: /etc/systemd/system/manager.service
       - file: /etc/systemd/system/manager.service
       - file: /etc/systemd/system/managercelery@.service
       - file: /etc/systemd/system/managercelery@.service
       {% else %}
       {% else %}

salt/manager/rabbitmq.sls

@@ -20,13 +20,15 @@ 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