Merge pull request #4 from eole/feature/drop-custom-module

feat(config): salt has a module to serialize to TOML
saltstack-formulas · Mar 10, 2020 · 75e29e5 · 75e29e5
2 parents a997b96 + db7098e
commit 75e29e5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -60,29 +60,29 @@ jobs:
     # the `platforms` defined in `kitchen.yml`
     - env: INSTANCE=default-debian-10-master-py3
     # - env: INSTANCE=default-ubuntu-1804-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
-    # - env: INSTANCE=default-fedora-31-master-py3
+    - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-fedora-31-master-py3
     # - env: INSTANCE=default-opensuse-leap-151-master-py3
     # - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-arch-base-latest-master-py2
     # - env: INSTANCE=default-debian-10-2019-2-py3
     # - env: INSTANCE=default-debian-9-2019-2-py3
     - env: INSTANCE=default-ubuntu-1804-2019-2-py3
-    - env: INSTANCE=default-centos-8-2019-2-py3
-    - env: INSTANCE=default-fedora-31-2019-2-py3
+    # - env: INSTANCE=default-centos-8-2019-2-py3
+    # - env: INSTANCE=default-fedora-31-2019-2-py3
     # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=default-centos-7-2019-2-py2
+    - env: INSTANCE=default-centos-7-2019-2-py2
     # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
     # - env: INSTANCE=default-arch-base-latest-2019-2-py2
     # - env: INSTANCE=default-fedora-30-2018-3-py3
-    # - env: INSTANCE=default-debian-9-2018-3-py2
-    # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
+    - env: INSTANCE=default-debian-9-2018-3-py2
+    - env: INSTANCE=default-ubuntu-1604-2018-3-py2
     # - env: INSTANCE=default-centos-7-2018-3-py2
-    - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
+    # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
     # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
     # - env: INSTANCE=default-arch-base-latest-2018-3-py2
     # - env: INSTANCE=default-debian-8-2017-7-py2
-    - env: INSTANCE=default-ubuntu-1604-2017-7-py2
+    # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
     # - env: INSTANCE=default-centos-6-2017-7-py2
     # - env: INSTANCE=default-fedora-30-2017-7-py2
     # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2

diff --git a/FORMULA b/FORMULA
@@ -3,7 +3,7 @@ os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE
 os_family: Debian, RedHat, Suse
 version: 0.3.1
 release: 1
-minimum_version: 2017.7
+minimum_version: 2018.3
 summary: Telegraf formula
 description: Formula to use to install and configure telegraf
 top_level_dir: telegraf
diff --git a/_modules/toml_lang.py b/_modules/toml_lang.py
diff --git a/telegraf/files/default/telegraf.tmpl.jinja b/telegraf/files/default/telegraf.tmpl.jinja
@@ -3,4 +3,4 @@
 # Your changes will be overwritten.
 ########################################################################
 
-{{ salt['toml_lang.dumps'](telegraf) }}
+{{ salt['slsutil.serialize']('toml', telegraf) }}
diff --git a/telegraf/map.jinja b/telegraf/map.jinja
@@ -57,9 +57,7 @@
 {%-     do telegraf.update({'toml_pkg': 'python2-pytoml'}) %}
 {%-   endif %}
 {%- elif grains.pythonversion[0] == 3 %}
-{%-   if osfinger in ['CentOS Linux-8'] %}
-{%-     do telegraf.update({'toml_pkg': 'python3-toml'}) %}
-{%-   elif osfinger in ['CentOS Linux-7'] %}
+{%-   if osfinger in ['CentOS Linux-7'] %}
 {%-     do telegraf.update({'toml_pkg': 'python36-pytoml'}) %}
 {%-   else %}
 {%-     do telegraf.update({'toml_pkg': 'python3-pytoml'}) %}