From 2b83ca08609ffe8a5e090f8729c3bde313821bed Mon Sep 17 00:00:00 2001
From: Eric Veiras Galisson <eric@sietch-tabr.com>
Date: Tue, 31 Oct 2017 14:09:52 +0100
Subject: [PATCH] refactoring code to use map.jinja for config values

at the moment only Debian managed, FreeBSD exception still in state
---
 haproxy/config.sls  | 13 ++++++++-----
 haproxy/install.sls |  4 +++-
 haproxy/map.jinja   | 11 +++++++++++
 haproxy/service.sls |  4 +++-
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 haproxy/map.jinja

diff --git a/haproxy/config.sls b/haproxy/config.sls
index e8c9865..21cc8fc 100644
--- a/haproxy/config.sls
+++ b/haproxy/config.sls
@@ -1,13 +1,16 @@
+{% from "haproxy/map.jinja" import haproxy with context %}
+
+{% set config_file = salt['pillar.get']('haproxy:config_file_path', haproxy.config_file) %}
 haproxy.config:
  file.managed:
-   - name: {{ salt['pillar.get']('haproxy:config_file_path', '/etc/haproxy/haproxy.cfg') }}
-   - source: salt://haproxy/templates/haproxy.jinja
+   - name: {{ config_file }}
+   - source: {{ haproxy.config_file_source }}
    - template: jinja
-   - user: root
+   - user: {{ haproxy.user }}
    {% if salt['grains.get']('os_family') == 'FreeBSD' %}
    - group: wheel
    {% else %}
-   - group: root
+   - group: {{ haproxy.group }}
    {% endif %}
    - mode: 644
    - require_in:
@@ -16,5 +19,5 @@ haproxy.config:
      - service: haproxy.service
    {% if salt['pillar.get']('haproxy:overwrite', default=True) == False %}
    - unless:
-     - test -e {{ salt['pillar.get']('haproxy:config_file_path', '/etc/haproxy/haproxy.cfg') }}
+     - test -e {{ config_file }}
    {% endif %}
diff --git a/haproxy/install.sls b/haproxy/install.sls
index 736320f..2a971fa 100644
--- a/haproxy/install.sls
+++ b/haproxy/install.sls
@@ -1,6 +1,8 @@
+{% from "haproxy/map.jinja" import haproxy with context %}
+
 haproxy.install:
   pkg.installed:
-    - name: haproxy
+    - name: {{ haproxy.package }}
 {% if salt['pillar.get']('haproxy:require') %}
     - require:
 {% for item in salt['pillar.get']('haproxy:require') %}
diff --git a/haproxy/map.jinja b/haproxy/map.jinja
new file mode 100644
index 0000000..ae71ad5
--- /dev/null
+++ b/haproxy/map.jinja
@@ -0,0 +1,11 @@
+{% set haproxy = salt['grains.filter_by']({
+    'Debian': {
+        'package': 'haproxy',
+        'config_file': '/etc/haproxy/haproxy.cfg',
+        'config_file_source': 'salt://haproxy/templates/haproxy.jinja',
+        'user': 'root',
+        'group': 'root',
+        'service': 'haproxy',
+    },
+}, merge=salt['pillar.get']('haproxy:lookup')) %}
+
diff --git a/haproxy/service.sls b/haproxy/service.sls
index 21c8434..6883315 100644
--- a/haproxy/service.sls
+++ b/haproxy/service.sls
@@ -1,7 +1,9 @@
+{% from "haproxy/map.jinja" import haproxy with context %}
+
 haproxy.service:
 {% if salt['pillar.get']('haproxy:enable', True) %}
   service.running:
-    - name: haproxy
+    - name: {{ haproxy.service }}
     - enable: True
     - reload: True
     - require: