commit 9e9123cea820dac29041125517ee02fbd4e7bb3a
author Petr Jediny <pjediny@mirantis.com> Mon Mar 12 13:52:36 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Mon Mar 12 13:52:36 2018 +0000
tree 2271fb3871d51f76a842de72397e214e04003c46
parent 495245a685152dadfb8a02a6a9e9c61de9de0b1b
parent c1d993bfe86283c8116a27cb435f437b8ee7b593

Merge "Add dependency between ovs-port and dpdk bridge."

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index e708ea2..a998cfd 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,9 +29,9 @@
   sudo: true
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial-2017.7'%>
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial-2017.7'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 0b24242..4ba771d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,19 +22,14 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=network
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=network
-  # - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=storage
-  # - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=storage
-  - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=system
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=system
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=network
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=network
-  # - PLATFORM=trevorj/salty-whales:trusty SUITE=storage
-  # - PLATFORM=trevorj/salty-whales:xenial SUITE=storage
-  - PLATFORM=trevorj/salty-whales:trusty SUITE=system
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=system
-## Test on both Salt version until there is new test policy accepted
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=network
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=network
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=storage
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=storage
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=system
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=system
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=network
+  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=system
 
 before_script:
   - set -o pipefail

linux/map.jinja

diff --git a/linux/map.jinja b/linux/map.jinja
index 185c131..8247837 100644
--- a/linux/map.jinja
+++ b/linux/map.jinja
@@ -141,6 +141,13 @@
     'maxwait',
     'stp',
     'gro',
+    'rx',
+    'tx',
+    'sg',
+    'tso',
+    'ufo',
+    'gso',
+    'lro',
     'lacp_rate',
     'ad_select',
     'downdelay',

linux/meta/fluentd.yml

diff --git a/linux/meta/fluentd.yml b/linux/meta/fluentd.yml
index 84ee3de..621a378 100644
--- a/linux/meta/fluentd.yml
+++ b/linux/meta/fluentd.yml
@@ -2,7 +2,7 @@
 agent:
   plugin:
     fluent-plugin-systemd:
-      gem: ['fluent-plugin-systemd']
+      deb: ['td-agent-additional-plugins']
   config:
     label:
       default_metric:

tests/pillar/system.sls

diff --git a/tests/pillar/system.sls b/tests/pillar/system.sls
index bcbfa08..eb6201e 100644
--- a/tests/pillar/system.sls
+++ b/tests/pillar/system.sls
@@ -204,10 +204,10 @@
         key_url: http://apt-mk.mirantis.com/public.gpg
         architectures: amd64
     locale:
-      en_US.UTF-8:
+      en_US:
         enabled: true
         default: true
-      "cs_CZ.UTF-8 UTF-8":
+      cs_CZ:
         enabled: true
     autoupdates:
       enabled: true