Merge branch 'fixing-current-issues-with-pipeline' into add-journal-settings

.travis.yml

@@ -26,18 +26,20 @@ install:
   - bundle install
 
 env:
-  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=network
-  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=system
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=network
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=system
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=network
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=system
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=duo
+  - PLATFORM=netmanagers/salt-2019.2-py3:ubuntu-18.04 SUITE=network
+  # - PLATFORM=netmanagers/salt-2019.2-py3:ubuntu-18.04 SUITE=system
+  # - PLATFORM=netmanagers/salt-2019.2-py3:ubuntu-18.04 SUITE=duo 
   # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=network
   # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=system
   # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=network
   # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=system
-
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=system
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=network
 before_script:
   - set -o pipefail
   - make test | tail

linux/system/auth/duo.sls

@@ -3,6 +3,8 @@
 package_duo:
   pkg.installed:
     - name: duo-unix
+    - skip_verify: True
+
 
 login_duo:
   file.managed:

linux/system/journal.sls

@@ -3,14 +3,14 @@
 
 {%- if system.systemd.journal is defined %}
 
-linux_systemd_system_config:
+linux_systemd_journal_config:
   file.managed:
     - name: /etc/systemd/journald.conf.d/90-salt.conf
     - source: salt://linux/files/journal.conf
     - template: jinja
     - makedirs: True
     - defaults:
-        settings: {{ system.systemd.journal }}
+        settings: {{ system.systemd.journal|tojson }}
     - watch_in:
       - module: linux_journal_systemd_reload
 

linux/system/systemd.sls

@@ -1,5 +1,9 @@
 {%- from "linux/map.jinja" import system with context %}
 {%- if system.enabled and grains.get('init', None) == 'systemd' %}
+{%- if system.systemd.journal is defined %}
+include: 
+  - linux.system.journal
+{%- endif %}
 
 {%- if system.systemd.system is defined %}
 linux_systemd_system_config: