Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-04-21 12:34:37 +02:00
Code Issues Activity

convert abspath jinja URIs to relapath for _root and _mountpoint gitfs support

Browse Source
This commit is contained in:
Niklauz 2016-04-24 15:53:38 -04:00
parent 6578fb2ae2
commit b828025565
17 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/api.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath + "/map.jinja" import salt_settings with context %}
include:
- salt.master

2
salt/cloud.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath + "/map.jinja" import salt_settings with context %}
python-pip:
pkg.installed

2
salt/files/master.d/f_defaults.conf
View File

@ -12,7 +12,7 @@
#{{ configname }}: {{ default_value }}
{%- endif -%}
{%- endmacro -%}
{%- from 'salt/formulas.jinja' import file_roots, formulas with context -%}
{%- from uri_formulas_jinja import file_roots, formulas with context -%}
##### Primary configuration settings #####
##########################################
# This configuration file is used to manage the behavior of the Salt Master.

2
salt/files/minion.d/f_defaults.conf
View File

@ -13,7 +13,7 @@
#{{ configname }}: {{ default_value }}
{%- endif -%}
{%- endmacro -%}
{%- from 'salt/formulas.jinja' import file_roots, formulas with context -%}
{%- from uri_formulas_jinja import file_roots, formulas with context -%}
##### Primary configuration settings #####
##########################################

2
salt/formulas.sls
View File

@ -1,7 +1,7 @@
{% set processed_gitdirs = [] %}
{% set processed_basedirs = [] %}
{% from "salt/formulas.jinja" import formulas_git_opt with context %}
{% from slspath + "/formulas.jinja" import formulas_git_opt with context %}
# Loop over all formulas listed in pillar data
{% for env, entries in salt['pillar.get']('salt_formulas:list', {}).items() %}

2
salt/gitfs/dulwich.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath.split('/')[:-1] + "/map.jinja" import salt_settings with context %}
# issue 34
{% if salt_settings.gitfs.dulwich.install_from_source %}

2
salt/gitfs/gitpython.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath.split('/')[:-1] + "/map.jinja" import salt_settings with context %}
{% if salt_settings.gitfs.gitpython.install_from_source %}

2
salt/gitfs/pygit2.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath.split('/')[:-1] + "/map.jinja" import salt_settings with context %}
{% set pygit2_settings = salt_settings.gitfs.pygit2 %}
{% if pygit2_settings.git.get('require_state', False) %}

2
salt/map.jinja
View File

@ -2,7 +2,7 @@
# vim: ft=jinja
{## Start with defaults from defaults.yaml ##}
{% import_yaml "salt/defaults.yaml" as default_settings %}
{% import_yaml slspath + "/defaults.yaml" as default_settings %}
{##
Setup variable using grains['os_family'] based logic, only add key:values here

4
salt/master.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath + "/map.jinja" import salt_settings with context %}
salt-master:
{% if salt_settings.install_packages %}
@ -11,6 +11,8 @@ salt-master:
- source: salt://{{ slspath }}/files/master.d
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
- defaults:
uri_formulas: {{ slspath + "/formulas.jinja" }}
service.running:
- enable: True
- name: {{ salt_settings.master_service }}

2
salt/minion.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath + "/map.jinja" import salt_settings with context %}
salt-minion:
{% if salt_settings.install_packages %}

2
salt/pkgrepo/debian/absent.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath.split('/')[:-1] + "/map.jinja" import salt_settings with context %}
drop-saltstack-pkgrepo:
pkgrepo.absent:

2
salt/pkgrepo/debian/init.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath.split('/')[:-1] + "/map.jinja" import salt_settings with context %}
saltstack-pkgrepo:
pkgrepo.managed:

2
salt/pkgrepo/redhat/init.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath.splt('/')[:-1] + "/map.jinja" import salt_settings with context %}
saltstack-pkgrepo:
pkgrepo.managed:

2
salt/ssh.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath + "/map.jinja" import salt_settings with context %}
{% if salt_settings.install_packages %}
ensure-salt-ssh-is-installed:

2
salt/standalone.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath + "/map.jinja" import salt_settings with context %}
salt-minion:
{% if salt_settings.install_packages %}

2
salt/syndic.sls
View File

@ -1,4 +1,4 @@
{% from "salt/map.jinja" import salt_settings with context %}
{% from slspath + "/map.jinja" import salt_settings with context %}
include:
- salt.master