valitydev/salt-common
14
0
Fork 0
mirror of https://github.com/valitydev/salt-common.git synced 2024-11-06 10:25:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Embed use flags in version only

Browse Source
This commit is contained in:
Antsiferov Grigory 2018-03-13 10:29:34 +03:00
parent 4b171aee7f
commit 9157e861ef
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sls/kerberos/pkg.sls
View File

@ -3,5 +3,4 @@
app-crypt/mit-krb5: app-crypt/mit-krb5:
pkg.installed: pkg.installed:
- version: "{{ krb5_version }}" - version: "{{ krb5_version }}[{{ ','.join(krb5_use) }}]"
- uses: {{ krb5_use }}

3
sls/lib/libtirpc.sls
View File

@ -3,5 +3,4 @@
net-libs/libtirpc: net-libs/libtirpc:
pkg.installed: pkg.installed:
- version: "{{ libtirpc_version }}" - version: "{{ libtirpc_version }}[{{ ','.join(libtirpc_use) }}]"
- uses: {{ libtirpc_use }}

3
sls/nds/rpcbind.sls
View File

@ -5,7 +5,6 @@ include:
net-nds/rpcbind: net-nds/rpcbind:
pkg.installed: pkg.installed:
- version: "{{ rpcbind_version }}" - version: "{{ rpcbind_version }}[{{ ','.join(rpcbind_use) }}]"
- uses: {{ rpcbind_use }}
- require: - require:
- pkg: net-libs/libtirpc - pkg: net-libs/libtirpc

5
sls/nfs/pkg.sls
View File

@ -1,6 +1,6 @@
{% set utils_version = salt['pillar.get']('nfs:utils:version', '>=2.3.1') %} {% set utils_version = salt['pillar.get']('nfs:utils:version', '>=2.3.1') %}
{% set utils_use = salt['pillar.get']('nfs:utils:use', ['caps','kerberos','nfsv4','nfsv41','-tcpd']) %} {% set utils_use = salt['pillar.get']('nfs:utils:use', ['caps','kerberos','nfsv4','nfsv41','-tcpd']) %}
{% set utils_use_str = '[' + ']' %}
include: include:
- nds.rpcbind - nds.rpcbind
{% if 'kerberos' in utils_use %} {% if 'kerberos' in utils_use %}
@ -9,8 +9,7 @@ include:
net-fs/nfs-utils: net-fs/nfs-utils:
pkg.installed: pkg.installed:
- version: "{{ utils_version }}" - version: "{{ utils_version }}[{{ ','.join(utils_use) }}]"
- uses: {{ utils_use }}
- require: - require:
- pkg: net-libs/libtirpc - pkg: net-libs/libtirpc
- pkg: net-nds/rpcbind - pkg: net-nds/rpcbind