saltstack-formulas/packages-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/packages-formula.git synced 2025-04-17 10:10:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(includes): Use relative state include

Browse source 
Allow to rename the formula so it does not collide with others with the same name
(ie, SUSE Manager's)
This commit is contained in:
Robin Schneider 2021-06-14 16:59:19 +02:00 • committed by GitHub
parent 364563df4d
commit abe828663e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/archives.sls
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=sls # vim: ft=sls
{%- from "packages/map.jinja" import packages with context %} {%- from "./map.jinja" import packages with context %}
{%- set wanted_archives = packages.archives.required.archives %} {%- set wanted_archives = packages.archives.required.archives %}
{%- do wanted_archives.update( packages.archives.wanted ) %} {%- do wanted_archives.update( packages.archives.wanted ) %}
@ -10,7 +10,7 @@
{%- set req_packages = packages.pkgs.required.pkgs + packages.archives.pkgs.required %} {%- set req_packages = packages.pkgs.required.pkgs + packages.archives.pkgs.required %}
include: include:
- packages.pkgs - .pkgs
extend: extend:
pkg_req_pkgs: pkg_req_pkgs:

2
packages/chocolatey.sls
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=sls # vim: ft=sls
{%- from "packages/map.jinja" import packages with context %} {%- from "./map.jinja" import packages with context %}
{%- if grains['os'] == 'Windows' %} {%- if grains['os'] == 'Windows' %}

18
packages/init.sls
View file

@ -2,12 +2,12 @@
# vim: ft=sls # vim: ft=sls
include: include:
- packages.pkgs - .pkgs
- packages.remote_pkgs - .remote_pkgs
- packages.pips - .pips
- packages.gems - .gems
- packages.npms - .npms
- packages.archives - .archives
- packages.snaps - .snaps
- packages.golang - .golang
- packages.chocolatey - .chocolatey

8
packages/map.jinja
View file

@ -1,10 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=jinja # vim: ft=jinja
{%- import_yaml 'packages/defaults.yaml' as defaults %} {%- import_yaml './defaults.yaml' as defaults %}
{%- import_yaml 'packages/osfamilymap.yaml' as osfamilymap %} {%- import_yaml './osfamilymap.yaml' as osfamilymap %}
{%- import_yaml 'packages/osmap.yaml' as osmap %} {%- import_yaml './osmap.yaml' as osmap %}
{%- import_yaml 'packages/osfingermap.yaml' as osfingermap %} {%- import_yaml './osfingermap.yaml' as osfingermap %}
{%- set packages = salt['grains.filter_by']( {%- set packages = salt['grains.filter_by'](
defaults, defaults,

2
packages/npms.sls
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=sls # vim: ft=sls
{%- from "packages/map.jinja" import packages with context %} {%- from "./map.jinja" import packages with context %}
{%- set req_states = packages.npms.required.states %} {%- set req_states = packages.npms.required.states %}
{%- set req_pkgs = packages.npms.required.pkgs %} {%- set req_pkgs = packages.npms.required.pkgs %}

2
packages/pkgs.sls
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=sls # vim: ft=sls
{%- from "packages/map.jinja" import packages with context %} {%- from "./map.jinja" import packages with context %}
{%- set req_states = packages.pkgs.required.states %} {%- set req_states = packages.pkgs.required.states %}
{%- set req_packages = packages.pkgs.required.pkgs %} {%- set req_packages = packages.pkgs.required.pkgs %}

2
packages/remote_pkgs.sls
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=sls # vim: ft=sls
{%- from "packages/map.jinja" import packages with context %} {%- from "./map.jinja" import packages with context %}
{%- set wanted_rem_pkgs = packages.remote_pkgs %} {%- set wanted_rem_pkgs = packages.remote_pkgs %}

4
packages/snaps.sls
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: ft=sls # vim: ft=sls
{%- from "packages/map.jinja" import packages with context %} {%- from "./map.jinja" import packages with context %}
# As we are 'extend'ing pkg_req_pkgs and unwanted_pkgs, we need to concatenate # As we are 'extend'ing pkg_req_pkgs and unwanted_pkgs, we need to concatenate
# the attributes correctly (see #17) # the attributes correctly (see #17)
@ -17,7 +17,7 @@
### REQ PKGS (without this, SNAPS can fail to install/uninstall) ### REQ PKGS (without this, SNAPS can fail to install/uninstall)
include: include:
- packages.pkgs - .pkgs
{%- if req_states %} {%- if req_states %}
{%- for dep in req_states %} {%- for dep in req_states %}
- {{ dep }} - {{ dep }}