commit ebada5745e637f4b2c403a8113818b1dede6960a
author Jakub Josef <jjosef@mirantis.com> Mon Jan 22 16:26:57 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Mon Jan 22 16:26:57 2018 +0000
tree d446194f453300d9b0aaa7ed47b99ecd02e2be4c
parent 8800e29d493ebbc506b44d81065bf7119225d91b
parent 6831a33158c79953b83061c791e5110fdc5b474c

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

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 7afab55..a14a20a 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -40,9 +40,9 @@
   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
 
 suites:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index cc1ea51..325550a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,11 @@
   - bundle install
 
 env:
-  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server-cluster
-  # - PLATFORM=trevorj/salty-whales:trusty SUITE=server-single
+  # - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-cluster
+  # - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-single
   # Missing Trusty packages for aodh
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server-cluster
-  - PLATFORM=trevorj/salty-whales:xenial SUITE=server-single
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-cluster
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-single
 
 before_script:
   - set -o pipefail

aodh/meta/sphinx.yml

diff --git a/aodh/meta/sphinx.yml b/aodh/meta/sphinx.yml
index dd68485..21723a6 100644
--- a/aodh/meta/sphinx.yml
+++ b/aodh/meta/sphinx.yml
@@ -42,6 +42,6 @@
           value: |
             {%- for pkg in server.pkgs %}
             {%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
-            * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+            * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
             {%- endfor %}
   {%- endif %}