Skip to content

Gelencsér Szabolcs / salt

Go to a project
Commit ef774969 by Bach Dániel
Options

replace runas

parent 3984e652
Showing with 13 additions and 14 deletions
salt/agentdriver/virtualenv.sls
...@@ -2,5 +2,5 @@ virtualenv_agentdriver: ...@@ -2,5 +2,5 @@ virtualenv_agentdriver:
virtualenv.managed: virtualenv.managed:
- name: /home/{{ pillar['user'] }}/.virtualenvs/agentdriver - name: /home/{{ pillar['user'] }}/.virtualenvs/agentdriver
- requirements: /home/{{ pillar['user'] }}/agentdriver/requirements.txt - requirements: /home/{{ pillar['user'] }}/agentdriver/requirements.txt
- runas: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- no_chown: true - no_chown: true
salt/fwdriver/virtualenv.sls
...@@ -2,5 +2,5 @@ virtualenv_fwdriver: ...@@ -2,5 +2,5 @@ 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.txt
- runas: {{ pillar['fwdriver']['user'] }} - user: {{ pillar['fwdriver']['user'] }}
- no_chown: true - no_chown: true
salt/graphite/virtualenv.sls
...@@ -2,7 +2,7 @@ virtualenv_graphite: ...@@ -2,7 +2,7 @@ virtualenv_graphite:
virtualenv.managed: virtualenv.managed:
- name: /home/{{ pillar['graphite']['user'] }}/.virtualenvs/graphite - name: /home/{{ pillar['graphite']['user'] }}/.virtualenvs/graphite
- requirements: /home/{{ pillar['graphite']['user'] }}/requirements.txt - requirements: /home/{{ pillar['graphite']['user'] }}/requirements.txt
- runas: {{ pillar['graphite']['user'] }} - user: {{ pillar['graphite']['user'] }}
- require: - require:
- user: {{ pillar['graphite']['user'] }} - user: {{ pillar['graphite']['user'] }}
- file: /home/{{ pillar['graphite']['user'] }}/requirements.txt - file: /home/{{ pillar['graphite']['user'] }}/requirements.txt
......
salt/manager/agentgit.sls
...@@ -6,6 +6,6 @@ agentgit: ...@@ -6,6 +6,6 @@ agentgit:
- name: {{ pillar['agent']['repo_name'] }} - name: {{ pillar['agent']['repo_name'] }}
- rev: {{ pillar['agent']['repo_revision'] }} - rev: {{ pillar['agent']['repo_revision'] }}
- target: /home/{{ pillar['user'] }}/agent/agent-linux - target: /home/{{ pillar['user'] }}/agent/agent-linux
- runas: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- require: - require:
- pkg: git - pkg: git
salt/manager/gitrepo.sls
...@@ -6,6 +6,6 @@ gitrepo: ...@@ -6,6 +6,6 @@ gitrepo:
- name: {{ pillar['manager']['repo_name'] }} - name: {{ pillar['manager']['repo_name'] }}
- rev: {{ pillar['manager']['repo_revision'] }} - rev: {{ pillar['manager']['repo_revision'] }}
- target: /home/{{ pillar['user'] }}/circle - target: /home/{{ pillar['user'] }}/circle
- runas: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- require: - require:
- pkg: git - pkg: git
salt/manager/postgres.sls
...@@ -31,7 +31,7 @@ dbuser: ...@@ -31,7 +31,7 @@ dbuser:
postgres_user.present: postgres_user.present:
- name: {{ pillar['database']['user'] }} - name: {{ pillar['database']['user'] }}
- password: {{ pillar['database']['password'] }} - password: {{ pillar['database']['password'] }}
- runas: postgres - user: postgres
- require: - require:
- service: postgresql - service: postgresql
...@@ -43,7 +43,7 @@ database: ...@@ -43,7 +43,7 @@ database:
- lc_collate: en_US.UTF8 - lc_collate: en_US.UTF8
- template: template0 - template: template0
- owner: {{ pillar['database']['user'] }} - owner: {{ pillar['database']['user'] }}
- runas: postgres - user: postgres
- require: - require:
- service: postgresql - service: postgresql
- postgres_user: dbuser - postgres_user: dbuser
salt/manager/virtualenv.sls
...@@ -17,7 +17,7 @@ virtualenv_manager: ...@@ -17,7 +17,7 @@ virtualenv_manager:
virtualenv.managed: virtualenv.managed:
- 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
- runas: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- cwd: /home/{{ pillar['user'] }}/circle/ - cwd: /home/{{ pillar['user'] }}/circle/
- no_chown: true - no_chown: true
- require: - require:
......
salt/monitor-client/virtualenv.sls
...@@ -2,5 +2,5 @@ virtualenv_monitor-client: ...@@ -2,5 +2,5 @@ virtualenv_monitor-client:
virtualenv.managed: virtualenv.managed:
- name: /home/{{ pillar['user'] }}/.virtualenvs/monitor-client - name: /home/{{ pillar['user'] }}/.virtualenvs/monitor-client
- requirements: /home/{{ pillar['user'] }}/monitor-client/requirements.txt - requirements: /home/{{ pillar['user'] }}/monitor-client/requirements.txt
- runas: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- no_chown: true - no_chown: true
salt/storagedriver/nfs-server.sls
...@@ -9,8 +9,7 @@ nfs-server: ...@@ -9,8 +9,7 @@ nfs-server:
- name: nfs-kernel-server - name: nfs-kernel-server
/etc/exports: /etc/exports:
file: file.managed:
- append
- template: jinja - template: jinja
- sources: - sources:
- salt://storagedriver/files/exports.tmpl - salt://storagedriver/files/exports.tmpl
......
salt/storagedriver/virtualenv.sls
...@@ -2,5 +2,5 @@ virtualenv_storagedriver: ...@@ -2,5 +2,5 @@ virtualenv_storagedriver:
virtualenv.managed: virtualenv.managed:
- name: /home/{{ pillar['user'] }}/.virtualenvs/storagedriver - name: /home/{{ pillar['user'] }}/.virtualenvs/storagedriver
- requirements: /home/{{ pillar['user'] }}/storagedriver/requirements/production.txt - requirements: /home/{{ pillar['user'] }}/storagedriver/requirements/production.txt
- runas: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- no_chown: true - no_chown: true
salt/vmdriver/virtualenv.sls
...@@ -2,7 +2,7 @@ virtualenv_vmdriver: ...@@ -2,7 +2,7 @@ virtualenv_vmdriver:
virtualenv.managed: virtualenv.managed:
- name: /home/{{ pillar['user'] }}/.virtualenvs/vmdriver - name: /home/{{ pillar['user'] }}/.virtualenvs/vmdriver
- requirements: /home/{{ pillar['user'] }}/vmdriver/requirements/production.txt - requirements: /home/{{ pillar['user'] }}/vmdriver/requirements/production.txt
- runas: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- no_chown: true - no_chown: true
{% set libvirt_dir = "/usr/lib64/python2.7/site-packages/" if grains['os_family'] == 'RedHat' else "/usr/lib/python2.7/dist-packages/" %} {% set libvirt_dir = "/usr/lib64/python2.7/site-packages/" if grains['os_family'] == 'RedHat' else "/usr/lib/python2.7/dist-packages/" %}
......
salt/vncproxy/virtualenv.sls
...@@ -2,5 +2,5 @@ virtualenv_vncproxy: ...@@ -2,5 +2,5 @@ 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.txt
- runas: {{ pillar['user'] }} - user: {{ pillar['user'] }}
- no_chown: true - 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