Merge pull request #8 from rossengeorgiev/slspath-patch

replace hardcoded paths with slspath variable

chrony/config.sls

@@ -1,13 +1,15 @@
-{% from "chrony/map.jinja" import chrony with context %}
+{% from slspath+"/map.jinja" import chrony with context %}
 
 include:
-  - chrony
+  - .init
 
 chrony_config:
   file.managed:
     - name: {{ chrony.config }}
     - source: {{ chrony.config_src }}
     - template: jinja
+    - defaults:
+        slspath: {{ slspath|yaml_encode }}
     - user: root
     - mode: 644
     - watch_in:

chrony/defaults.yaml

@@ -4,7 +4,7 @@ chrony:
   package: chrony
   service: chronyd
   config: /etc/chrony.conf
-  config_src: salt://chrony/files/chrony_config
+  config_src: salt://{{ slspath }}/files/chrony_config
   ntpservers:  [ '0.us.pool.ntp.org',
                  '1.us.pool.ntp.org',
                  '2.us.pool.ntp.org',

chrony/files/chrony_config

@@ -1,4 +1,4 @@
-{% from "chrony/map.jinja" import chrony as config with context %}
+{% from slspath+"/map.jinja" import chrony as config with context %}
 # This file is managed by salt
 {% for server in config.ntpservers -%}
 server {{ server }} {{ config.options }}

chrony/init.sls

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

chrony/map.jinja

@@ -1,6 +1,6 @@
 {## start with defaults from defaults.yaml ##}
-{% import_yaml "chrony/defaults.yaml" as defaults %}
-{% import_yaml "chrony/osmap.yaml" as osmap %}
+{% import_yaml slspath+"/defaults.yaml" as defaults %}
+{% import_yaml slspath+"/osmap.yaml" as osmap %}
 
 {% set chrony = salt['grains.filter_by'](
     defaults,

chrony/removed.sls

@@ -1,4 +1,4 @@
-{% from "chrony/map.jinja" import chrony with context %}
+{% from slspath+"/map.jinja" import chrony with context %}
 
 chrony_removed:
   service.dead: