Merge "Remove Salt deprecations and switch tests to Salt 2017.7"

.kitchen.yml

@@ -29,9 +29,9 @@ verifier:
   sudo: true
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial-2017.7'%>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial-2017.7'%>
       platform: ubuntu
 
 

.travis.yml

@@ -22,12 +22,19 @@ install:
   - 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
 
 before_script:
   - set -o pipefail

linux/files/multipath.conf

@@ -10,7 +10,7 @@ defaults {
 
 blacklist {
         {%- for device in storage.multipath.get('blacklist_devices', []) %}
-        wwid                  {{ salt['cmd.run']('/lib/udev/scsi_id -g -u '+device) }}
+        wwid                  {{ salt['cmd.shell']('/lib/udev/scsi_id -g -u '+device) }}
         {%- endfor %}
         devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st|nbd)[0-9]*"
 }

tests/pillar/system.sls

@@ -61,6 +61,7 @@ linux:
       testuser:
         enabled: true
         name: testuser
+        password: passw0rd
         sudo: true
         uid: 9999
         full_name: Test User