From e8021220b886877e371e4f27619ab6e76541b419 Mon Sep 17 00:00:00 2001
From: "Matthew X. Economou" <xenophon@irtnog.org>
Date: Tue, 16 Feb 2016 10:20:42 -0500
Subject: [PATCH] Revert PR #200

This restores the original structure/behavior of the
`salt_formulas` Pillar key.
---
 pillar.example      | 15 ++++++++-------
 salt/formulas.jinja |  4 +---
 salt/formulas.sls   |  5 ++---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pillar.example b/pillar.example
index 0198dff..614cc7d 100644
--- a/pillar.example
+++ b/pillar.example
@@ -135,6 +135,9 @@ salt_formulas:
     # environment, if an option is missing in a given environment, the
     # value from "default" is used instead.
     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
       basedir: /srv/formulas
       # Update the git repository to the latest version (False by default)
@@ -157,11 +160,9 @@ salt_formulas:
   # List of formulas to enable in each environment
   list:
     base:
-      https://github.com/saltstack-formulas:
-        - salt-formula
-        - postfix-formula
+      - salt-formula
+      - postfix-formula
     dev:
-      https://github.com/saltstack-formulas:
-        - salt-formula
-        - postfix-formula
-        - openssh-formula
+      - salt-formula
+      - postfix-formula
+      - openssh-formula
diff --git a/salt/formulas.jinja b/salt/formulas.jinja
index 123c88c..2a466a2 100644
--- a/salt/formulas.jinja
+++ b/salt/formulas.jinja
@@ -16,12 +16,10 @@
 
 {%- macro formulas_roots(env) -%}
 {%- set value = [] -%}
-{%- for repo,f_name in formulas.get(env, {}).items() -%}
-{%- for dir in f_name -%}
+{%- for dir in formulas.get(env, []) -%}
 {%- set basedir = formulas_git_opt(env, 'basedir')|load_yaml -%}
 {%- do value.append('{0}/{1}'.format(basedir, dir)) -%}
 {%- endfor -%}
-{%- endfor -%}
 {{ value|yaml }}
 {%- endmacro -%}
 
diff --git a/salt/formulas.sls b/salt/formulas.sls
index a58cc4f..b433bb5 100644
--- a/salt/formulas.sls
+++ b/salt/formulas.sls
@@ -4,8 +4,7 @@
 {% from "salt/formulas.jinja" import formulas_git_opt with context %}
 
 # Loop over all formulas listed in pillar data
-{% for env, elements in salt['pillar.get']('salt_formulas:list', {}).items() %}
-{% for baseurl, entries in elements.items() %}
+{% for env, entries in salt['pillar.get']('salt_formulas:list', {}).items() %}
 {% for entry in entries %}
 
 {% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %}
@@ -27,6 +26,7 @@
 {% if gitdir not in processed_gitdirs %}
 {% do processed_gitdirs.append(gitdir) %}
 {% set options = formulas_git_opt(env, 'options')|load_yaml %}
+{% set baseurl = formulas_git_opt(env, 'baseurl')|load_yaml %}
 {{ gitdir }}:
   git.latest:
     - name: {{ baseurl }}/{{ entry }}.git
@@ -43,4 +43,3 @@
 
 {% endfor %}
 {% endfor %}
-{% endfor %}