commit a028d7346de44f1227b7098f54e56fd5d9856983
author Oleh Hryhorov <ohryhorov@mirantis.com> Fri Jan 19 17:16:54 2018 +0200
committer Oleh Hryhorov <ohryhorov@mirantis.com> Mon Jan 22 15:51:28 2018 +0200
tree 3d6d6b86632bccb53db5fa7199eacfad56cba96e
parent 50327b98350c669b4d9c3f30aeac775f00138528

Deleting deprecated function and switch test to 2017.7

The patch deletes deprecated cmd.run function which actually
was defined in salt 2016 as alias for cmd.shell therefore this
change supports backward compatibility.

Change-Id: I96b6a6acb28884cbe1e1377fd261cbf7792f4568
Related-PROD: 17056

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 7ef9ad1..730b126 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@
   name: salt_solo
   salt_install: bootstrap
   salt_bootstrap_url: https://bootstrap.saltstack.com
-  salt_version: latest
+  salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
   require_chef: false
   log_level: error
   formula: keystone

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7cf63e4..e872346 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,13 +17,17 @@
   - bundle install
 
 env:
-  - PLATFORM=trevorj/salty-whales:trusty MYSQL_VERSION='5.5' SUITE=single
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 MYSQL_VERSION='5.5' SUITE=single
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 MYSQL_VERSION='5.7' SUITE=single
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 MYSQL_VERSION='5.5' SUITE=single_domain
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 MYSQL_VERSION='5.7' SUITE=single_domain
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 MYSQL_VERSION='5.5' SUITE=single_fernet
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 MYSQL_VERSION='5.7' SUITE=single_fernet
+#  - PLATFORM=trevorj/salty-whales:trusty-2017.7 MYSQL_VERSION='5.5' SUITE=under-apache
+  - PLATFORM=trevorj/salty-whales:xenial-2017.7 MYSQL_VERSION='5.7' SUITE=under-apache
   - PLATFORM=trevorj/salty-whales:xenial MYSQL_VERSION='5.7' SUITE=single
-  - PLATFORM=trevorj/salty-whales:trusty MYSQL_VERSION='5.5' SUITE=single_domain
   - PLATFORM=trevorj/salty-whales:xenial MYSQL_VERSION='5.7' SUITE=single_domain
-  - PLATFORM=trevorj/salty-whales:trusty MYSQL_VERSION='5.5' SUITE=single_fernet
   - PLATFORM=trevorj/salty-whales:xenial MYSQL_VERSION='5.7' SUITE=single_fernet
-  - PLATFORM=trevorj/salty-whales:trusty MYSQL_VERSION='5.5' SUITE=under-apache
   - PLATFORM=trevorj/salty-whales:xenial MYSQL_VERSION='5.7' SUITE=under-apache
 
 before_script:

keystone/meta/sphinx.yml

diff --git a/keystone/meta/sphinx.yml b/keystone/meta/sphinx.yml
index 9bf06cf..c867f7a 100644
--- a/keystone/meta/sphinx.yml
+++ b/keystone/meta/sphinx.yml
@@ -48,7 +48,7 @@
           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 %}
   {%- if pillar.keystone.control is defined %}