Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #200 from thomaslarsen/master 

Support for downloading formulas from multiple baseurls into same environment
This commit is contained in:
Forrest 2016-02-08 11:06:29 -08:00
parent 337c48b14c bbeacc4ace
commit b47fec3564
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pillar.example
View File

@ -135,9 +135,6 @@ salt_formulas:
# environment, if an option is missing in a given environment, the # environment, if an option is missing in a given environment, the
# value from "default" is used instead. # value from "default" is used instead.
default: default:
# URL where the formulas git repositories are downloaded from
# it will be suffixed with <formula-name>.git
baseurl: https://github.com/saltstack-formulas
# Directory where Git repositories are downloaded # Directory where Git repositories are downloaded
basedir: /srv/formulas basedir: /srv/formulas
# Update the git repository to the latest version (False by default) # Update the git repository to the latest version (False by default)
@ -160,9 +157,11 @@ salt_formulas:
# List of formulas to enable in each environment # List of formulas to enable in each environment
list: list:
base: base:
- salt-formula https://github.com/saltstack-formulas:
- postfix-formula - salt-formula
- postfix-formula
dev: dev:
- salt-formula https://github.com/saltstack-formulas:
- postfix-formula - salt-formula
- openssh-formula - postfix-formula
- openssh-formula

4
salt/formulas.jinja
View File

@ -16,10 +16,12 @@
{%- macro formulas_roots(env) -%} {%- macro formulas_roots(env) -%}
{%- set value = [] -%} {%- set value = [] -%}
{%- for dir in formulas.get(env, []) -%} {%- for repo,f_name in formulas.get(env, {}).items() -%}
{%- for dir in f_name -%}
{%- set basedir = formulas_git_opt(env, 'basedir')|load_yaml -%} {%- set basedir = formulas_git_opt(env, 'basedir')|load_yaml -%}
{%- do value.append('{0}/{1}'.format(basedir, dir)) -%} {%- do value.append('{0}/{1}'.format(basedir, dir)) -%}
{%- endfor -%} {%- endfor -%}
{%- endfor -%}
{{ value|yaml }} {{ value|yaml }}
{%- endmacro -%} {%- endmacro -%}

5
salt/formulas.sls
View File

@ -4,7 +4,8 @@
{% from "salt/formulas.jinja" import formulas_git_opt with context %} {% from "salt/formulas.jinja" import formulas_git_opt with context %}
# Loop over all formulas listed in pillar data # Loop over all formulas listed in pillar data
{% for env, entries in salt['pillar.get']('salt_formulas:list', {}).items() %} {% for env, elements in salt['pillar.get']('salt_formulas:list', {}).items() %}
{% for baseurl, entries in elements.items() %}
{% for entry in entries %} {% for entry in entries %}
{% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %} {% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %}
@ -26,7 +27,6 @@
{% if gitdir not in processed_gitdirs %} {% if gitdir not in processed_gitdirs %}
{% do processed_gitdirs.append(gitdir) %} {% do processed_gitdirs.append(gitdir) %}
{% set options = formulas_git_opt(env, 'options')|load_yaml %} {% set options = formulas_git_opt(env, 'options')|load_yaml %}
{% set baseurl = formulas_git_opt(env, 'baseurl')|load_yaml %}
{{ gitdir }}: {{ gitdir }}:
git.latest: git.latest:
- name: {{ baseurl }}/{{ entry }}.git - name: {{ baseurl }}/{{ entry }}.git
@ -43,3 +43,4 @@
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}
{% endfor %}