Commit b973dc4a by Czémán Arnold Committed by cloud

Update salt version to 2016.3.1

fwdriver, vncproxy: requirements workaround
graphite, manager: transform rabbitMQ user, and vhost state to the new form
parent 215399b6
virtualenv_fwdriver:
virtualenv.managed:
- 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'] }}
- no_chown: true
......@@ -11,11 +11,14 @@ rabbitmq_user_monitor:
rabbitmq_user.present:
- name: {{ pillar['graphite']['user'] }}
- password: {{ pillar['graphite']['password'] }}
- require:
- rabbitmq_vhost: virtual_host_monitor
- perms:
- {{ pillar['graphite']['vhost']}}:
- .*
- .*
- .*
virtual_host_monitor:
rabbitmq_vhost.present:
- name: {{ pillar['graphite']['vhost']}}
- user: {{ pillar['graphite']['user'] }}
- conf: .*
- write: .*
- read: .*
......@@ -20,14 +20,16 @@ rabbitmq_user:
- password: {{ pillar['amqp']['password'] }}
- require:
- service: rabbitmq-server
- rabbitmq_vhost: virtual_host
- perms:
- {{ pillar['amqp']['vhost']}}:
- .*
- .*
- .*
virtual_host:
rabbitmq_vhost.present:
- name: {{ pillar['amqp']['vhost']}}
- user: {{ pillar['amqp']['user'] }}
- conf: .*
- write: .*
- read: .*
- require:
- service: rabbitmq-server
......
......@@ -18,7 +18,6 @@ virtualenv_manager:
- name: /home/{{ pillar['user'] }}/.virtualenvs/circle
- requirements: /home/{{ pillar['user'] }}/circle/requirements/{{ pillar['deployment_type'] }}.txt
- user: {{ pillar['user'] }}
- cwd: /home/{{ pillar['user'] }}/circle/
- no_chown: true
- require:
- git: gitrepo
......
virtualenv_vncproxy:
virtualenv.managed:
- name: /home/{{ pillar['user'] }}/.virtualenvs/vncproxy
- requirements: /home/{{ pillar['user'] }}/vncproxy/requirements.txt
- requirements: /home/{{ pillar['user'] }}/vncproxy/requirements/production.txt
- user: {{ pillar['user'] }}
- no_chown: true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment